Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(471)

Side by Side Diff: ios/chrome/browser/ui/toolbar/toolbar_controller.mm

Issue 2968973002: [ios] Removes IDC_BOOKMARK_PAGE and IDC_SHARE_PAGE
Patch Set: Rebased Created 3 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright 2012 The Chromium Authors. All rights reserved. 1 // Copyright 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #import "ios/chrome/browser/ui/toolbar/toolbar_controller.h" 5 #import "ios/chrome/browser/ui/toolbar/toolbar_controller.h"
6 6
7 #include <QuartzCore/QuartzCore.h> 7 #include <QuartzCore/QuartzCore.h>
8 8
9 #include "base/format_macros.h" 9 #include "base/format_macros.h"
10 #include "base/i18n/rtl.h" 10 #include "base/i18n/rtl.h"
11 #include "base/ios/ios_util.h" 11 #include "base/ios/ios_util.h"
12 #include "base/mac/bundle_locations.h" 12 #include "base/mac/bundle_locations.h"
13 #include "base/mac/foundation_util.h" 13 #include "base/mac/foundation_util.h"
14 #include "base/memory/ptr_util.h" 14 #include "base/memory/ptr_util.h"
15 #include "base/metrics/user_metrics.h" 15 #include "base/metrics/user_metrics.h"
16 #include "base/metrics/user_metrics_action.h" 16 #include "base/metrics/user_metrics_action.h"
17 #import "ios/chrome/browser/ui/animation_util.h" 17 #import "ios/chrome/browser/ui/animation_util.h"
18 #import "ios/chrome/browser/ui/commands/UIKit+ChromeExecuteCommand.h" 18 #import "ios/chrome/browser/ui/commands/UIKit+ChromeExecuteCommand.h"
19 #import "ios/chrome/browser/ui/commands/generic_chrome_command.h" 19 #import "ios/chrome/browser/ui/commands/browser_commands.h"
20 #include "ios/chrome/browser/ui/commands/ios_command_ids.h" 20 #include "ios/chrome/browser/ui/commands/ios_command_ids.h"
21 #import "ios/chrome/browser/ui/fullscreen_controller.h" 21 #import "ios/chrome/browser/ui/fullscreen_controller.h"
22 #import "ios/chrome/browser/ui/image_util.h" 22 #import "ios/chrome/browser/ui/image_util.h"
23 #import "ios/chrome/browser/ui/reversed_animation.h" 23 #import "ios/chrome/browser/ui/reversed_animation.h"
24 #include "ios/chrome/browser/ui/rtl_geometry.h" 24 #include "ios/chrome/browser/ui/rtl_geometry.h"
25 #import "ios/chrome/browser/ui/toolbar/toolbar_controller+protected.h" 25 #import "ios/chrome/browser/ui/toolbar/toolbar_controller+protected.h"
26 #import "ios/chrome/browser/ui/toolbar/toolbar_controller_private.h" 26 #import "ios/chrome/browser/ui/toolbar/toolbar_controller_private.h"
27 #include "ios/chrome/browser/ui/toolbar/toolbar_resource_macros.h" 27 #include "ios/chrome/browser/ui/toolbar/toolbar_resource_macros.h"
28 #import "ios/chrome/browser/ui/toolbar/toolbar_tools_menu_button.h" 28 #import "ios/chrome/browser/ui/toolbar/toolbar_tools_menu_button.h"
29 #import "ios/chrome/browser/ui/toolbar/tools_menu_button_observer_bridge.h" 29 #import "ios/chrome/browser/ui/toolbar/tools_menu_button_observer_bridge.h"
(...skipping 263 matching lines...) Expand 10 before | Expand all | Expand 10 after
293 293
294 [view_ addSubview:backgroundView_]; 294 [view_ addSubview:backgroundView_];
295 [view_ addSubview:toolsMenuButton_]; 295 [view_ addSubview:toolsMenuButton_];
296 [view_ setAutoresizingMask:UIViewAutoresizingFlexibleWidth]; 296 [view_ setAutoresizingMask:UIViewAutoresizingFlexibleWidth];
297 [backgroundView_ setAutoresizingMask:UIViewAutoresizingFlexibleWidth | 297 [backgroundView_ setAutoresizingMask:UIViewAutoresizingFlexibleWidth |
298 UIViewAutoresizingFlexibleHeight]; 298 UIViewAutoresizingFlexibleHeight];
299 299
300 if (idiom == IPAD_IDIOM) { 300 if (idiom == IPAD_IDIOM) {
301 CGRect shareButtonFrame = LayoutRectGetRect(kShareMenuButtonFrame); 301 CGRect shareButtonFrame = LayoutRectGetRect(kShareMenuButtonFrame);
302 shareButton_ = [[UIButton alloc] initWithFrame:shareButtonFrame]; 302 shareButton_ = [[UIButton alloc] initWithFrame:shareButtonFrame];
303 [shareButton_ setTag:IDC_SHARE_PAGE];
304 [shareButton_ 303 [shareButton_
305 setAutoresizingMask:UIViewAutoresizingFlexibleLeadingMargin() | 304 setAutoresizingMask:UIViewAutoresizingFlexibleLeadingMargin() |
306 UIViewAutoresizingFlexibleBottomMargin]; 305 UIViewAutoresizingFlexibleBottomMargin];
307 [self setUpButton:shareButton_ 306 [self setUpButton:shareButton_
308 withImageEnum:ToolbarButtonNameShare 307 withImageEnum:ToolbarButtonNameShare
309 forInitialState:UIControlStateNormal 308 forInitialState:UIControlStateNormal
310 hasDisabledImage:YES 309 hasDisabledImage:YES
311 synchronously:NO]; 310 synchronously:NO];
311 [shareButton_ addTarget:self.dispatcher
312 action:@selector(sharePage)
313 forControlEvents:UIControlEventTouchUpInside];
312 SetA11yLabelAndUiAutomationName(shareButton_, IDS_IOS_TOOLS_MENU_SHARE, 314 SetA11yLabelAndUiAutomationName(shareButton_, IDS_IOS_TOOLS_MENU_SHARE,
313 kToolbarShareButtonIdentifier); 315 kToolbarShareButtonIdentifier);
314 [view_ addSubview:shareButton_]; 316 [view_ addSubview:shareButton_];
315 } 317 }
316 318
317 CGRect shadowFrame = kShadowViewFrame[idiom]; 319 CGRect shadowFrame = kShadowViewFrame[idiom];
318 shadowFrame.origin.y = CGRectGetMaxY(backgroundFrame); 320 shadowFrame.origin.y = CGRectGetMaxY(backgroundFrame);
319 shadowView_ = [[UIImageView alloc] initWithFrame:shadowFrame]; 321 shadowView_ = [[UIImageView alloc] initWithFrame:shadowFrame];
320 [shadowView_ setAutoresizingMask:UIViewAutoresizingFlexibleWidth]; 322 [shadowView_ setAutoresizingMask:UIViewAutoresizingFlexibleWidth];
321 [shadowView_ setUserInteractionEnabled:NO]; 323 [shadowView_ setUserInteractionEnabled:NO];
(...skipping 716 matching lines...) Expand 10 before | Expand all | Expand 10 after
1038 #pragma mark - 1040 #pragma mark -
1039 #pragma mark PopupMenuDelegate methods. 1041 #pragma mark PopupMenuDelegate methods.
1040 1042
1041 - (void)dismissPopupMenu:(PopupMenuController*)controller { 1043 - (void)dismissPopupMenu:(PopupMenuController*)controller {
1042 if ([controller isKindOfClass:[ToolsPopupController class]] && 1044 if ([controller isKindOfClass:[ToolsPopupController class]] &&
1043 (ToolsPopupController*)controller == toolsPopupController_) 1045 (ToolsPopupController*)controller == toolsPopupController_)
1044 [self dismissToolsMenuPopup]; 1046 [self dismissToolsMenuPopup];
1045 } 1047 }
1046 1048
1047 @end 1049 @end
OLDNEW
« no previous file with comments | « ios/chrome/browser/ui/key_commands_provider.mm ('k') | ios/chrome/browser/ui/toolbar/web_toolbar_controller.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698