[ios] Remove IDC_BACK and IDC_FORWARD

ios/chrome/browser/ui/toolbar/web_toolbar_controller.mm

 // Copyright 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #import "ios/chrome/browser/ui/toolbar/web_toolbar_controller.h"
 
 #import <CoreLocation/CoreLocation.h>
 #include <QuartzCore/QuartzCore.h>
 
 #include <stdint.h>
@@ skipping 19 matching lines @@
 #include "ios/chrome/browser/browser_state/chrome_browser_state.h"
 #include "ios/chrome/browser/chrome_url_constants.h"
 #include "ios/chrome/browser/experimental_flags.h"
 #include "ios/chrome/browser/reading_list/reading_list_model_factory.h"
 #include "ios/chrome/browser/search_engines/template_url_service_factory.h"
 #import "ios/chrome/browser/tabs/tab.h"
 #import "ios/chrome/browser/tabs/tab_model.h"
 #import "ios/chrome/browser/ui/animation_util.h"
 #import "ios/chrome/browser/ui/colors/MDCPalette+CrAdditions.h"
 #import "ios/chrome/browser/ui/commands/UIKit+ChromeExecuteCommand.h"
+#import "ios/chrome/browser/ui/commands/browser_commands.h"
 #import "ios/chrome/browser/ui/commands/generic_chrome_command.h"
 #include "ios/chrome/browser/ui/commands/ios_command_ids.h"
 #import "ios/chrome/browser/ui/history/tab_history_popup_controller.h"
 #import "ios/chrome/browser/ui/image_util.h"
 #import "ios/chrome/browser/ui/keyboard/hardware_keyboard_watcher.h"
 #include "ios/chrome/browser/ui/omnibox/location_bar_controller_impl.h"
 #include "ios/chrome/browser/ui/omnibox/omnibox_view_ios.h"
 #import "ios/chrome/browser/ui/popup_menu/popup_menu_view.h"
 #import "ios/chrome/browser/ui/reversed_animation.h"
 #include "ios/chrome/browser/ui/rtl_geometry.h"
@@ skipping 309 matching lines @@
 @end
 
 @implementation WebToolbarController
 
 @synthesize delegate = _delegate;
 @synthesize urlLoader = _urlLoader;
 
 - (instancetype)initWithDelegate:(id<WebToolbarDelegate>)delegate
                        urlLoader:(id<UrlLoader>)urlLoader
                     browserState:(ios::ChromeBrowserState*)browserState
-                 preloadProvider:(id<PreloadProvider>)preloader {
+                 preloadProvider:(id<PreloadProvider>)preloader
+                      dispatcher:(id<BrowserCommands>)dispatcher {
   DCHECK(delegate);
   DCHECK(urlLoader);
   DCHECK(browserState);
   _delegate = delegate;
   _urlLoader = urlLoader;
   _browserState = browserState;
   _incognito = browserState->IsOffTheRecord();
   self = [super initWithStyle:(_incognito ? ToolbarControllerStyleIncognitoMode
                                           : ToolbarControllerStyleLightMode)];
   if (!self)
     return nil;
 
+  self.dispatcher = dispatcher;
   self.readingListModel =
       ReadingListModelFactory::GetForBrowserState(browserState);
 
   InterfaceIdiom idiom = IsIPadIdiom() ? IPAD_IDIOM : IPHONE_IDIOM;
   // Note that |_webToolbar| gets its frame set to -specificControlArea later in
   // this method.
   _webToolbar =
       [[UIView alloc] initWithFrame:LayoutRectGetRect(kWebToolbarFrame[idiom])];
   UIColor* textColor =
       _incognito
@@ skipping 77 matching lines @@
       [self layoutIncognitoIcon];
       [_webToolbar addSubview:_incognitoIcon];
     }
   }
 
   [_webToolbar addSubview:_omniBox];
 
   [_backButton setEnabled:NO];
   [_forwardButton setEnabled:NO];
 
+  // Assign tags before calling -setUpButton, since only buttons with tags
+  // have -chromeExecuteCommand added as a target.
+  [_reloadButton setTag:IDC_RELOAD];
+  [_stopButton setTag:IDC_STOP];
+  [_starButton setTag:IDC_BOOKMARK_PAGE];
+  [_voiceSearchButton setTag:IDC_VOICE_SEARCH];
+
   if (idiom == IPAD_IDIOM) {
     // Note that the reload button gets repositioned when -layoutOmnibox is
     // called.
     _reloadButton = [[UIButton alloc]
         initWithFrame:LayoutRectGetRect(kStopReloadButtonFrame)];
     [_reloadButton
         setAutoresizingMask:UIViewAutoresizingFlexibleTrailingMargin() |
                             UIViewAutoresizingFlexibleBottomMargin];
     _stopButton = [[UIButton alloc]
         initWithFrame:LayoutRectGetRect(kStopReloadButtonFrame)];
@@ skipping 43 matching lines @@
          withImageEnum:WebToolbarButtonNameBack
        forInitialState:UIControlStateDisabled
       hasDisabledImage:YES
          synchronously:NO];
   [self setUpButton:_forwardButton
          withImageEnum:WebToolbarButtonNameForward
        forInitialState:UIControlStateDisabled
       hasDisabledImage:YES
          synchronously:NO];
 
+  // Assign targets for buttons using the dispatcher.
+  [_backButton addTarget:self.dispatcher
+                  action:@selector(goBack)
+        forControlEvents:UIControlEventTouchUpInside];
+  [_forwardButton addTarget:self.dispatcher
+                     action:@selector(goForward)
+           forControlEvents:UIControlEventTouchUpInside];
+
   _backButtonMode = ToolbarButtonModeNormal;
   _forwardButtonMode = ToolbarButtonModeNormal;
   UILongPressGestureRecognizer* backLongPress =
       [[UILongPressGestureRecognizer alloc]
           initWithTarget:self
                   action:@selector(handleLongPress:)];
   [_backButton addGestureRecognizer:backLongPress];
   UILongPressGestureRecognizer* forwardLongPress =
       [[UILongPressGestureRecognizer alloc]
           initWithTarget:self
                   action:@selector(handleLongPress:)];
   [_forwardButton addGestureRecognizer:forwardLongPress];
 
   // TODO(leng):  Consider moving this to a pak file as well.  For now,
   // because it is also used by find_bar_controller_ios, leave it as is.
   NSString* imageName =
       _incognito ? @"omnibox_transparent_background" : @"omnibox_background";
   [_omniboxBackground setImage:StretchableImageNamed(imageName, 12, 12)];
   [_omniBox setAutoresizingMask:UIViewAutoresizingFlexibleWidth |
                                 UIViewAutoresizingFlexibleBottomMargin];
   [_reloadButton addTarget:self
                     action:@selector(cancelOmniboxEdit)
           forControlEvents:UIControlEventTouchUpInside];
   [_stopButton addTarget:self
                   action:@selector(cancelOmniboxEdit)
         forControlEvents:UIControlEventTouchUpInside];
 
-  [_backButton setTag:IDC_BACK];
-  [_forwardButton setTag:IDC_FORWARD];
-  [_reloadButton setTag:IDC_RELOAD];
-  [_stopButton setTag:IDC_STOP];
-  [_starButton setTag:IDC_BOOKMARK_PAGE];
-  [_voiceSearchButton setTag:IDC_VOICE_SEARCH];
-
   SetA11yLabelAndUiAutomationName(_backButton, IDS_ACCNAME_BACK, @"Back");
   SetA11yLabelAndUiAutomationName(_forwardButton, IDS_ACCNAME_FORWARD,
                                   @"Forward");
   SetA11yLabelAndUiAutomationName(_reloadButton, IDS_IOS_ACCNAME_RELOAD,
                                   @"Reload");
   SetA11yLabelAndUiAutomationName(_stopButton, IDS_IOS_ACCNAME_STOP, @"Stop");
   SetA11yLabelAndUiAutomationName(_starButton, IDS_TOOLTIP_STAR, @"Bookmark");
   SetA11yLabelAndUiAutomationName(
       _voiceSearchButton, IDS_IOS_ACCNAME_VOICE_SEARCH, @"Voice Search");
   SetA11yLabelAndUiAutomationName(_omniBox, IDS_ACCNAME_LOCATION, @"Address");
@@ skipping 1881 matching lines @@
 
 - (BOOL)isPrerenderAnimationRunning {
   return _prerenderAnimating;
 }
 
 - (OmniboxTextFieldIOS*)omnibox {
   return _omniBox;
 }
 
 @end