[ios] Remove IDC_STOP and IDC_RELOAD

ios/chrome/browser/ui/tools_menu/tools_menu_view_controller.mm

 // Copyright 2014 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/tools_menu/tools_menu_view_controller.h"
 
 #include <stdint.h>
 
 #include "base/ios/ios_util.h"
 #include "base/logging.h"
 #include "base/metrics/field_trial.h"
 #include "base/metrics/histogram_macros.h"
 #include "components/strings/grit/components_strings.h"
 #include "ios/chrome/browser/experimental_flags.h"
 #import "ios/chrome/browser/ui/animation_util.h"
 #import "ios/chrome/browser/ui/commands/UIKit+ChromeExecuteCommand.h"
+#import "ios/chrome/browser/ui/commands/browser_commands.h"
 #include "ios/chrome/browser/ui/commands/ios_command_ids.h"
 #import "ios/chrome/browser/ui/reading_list/reading_list_menu_notification_delegate.h"
 #import "ios/chrome/browser/ui/reading_list/reading_list_menu_notifier.h"
 #import "ios/chrome/browser/ui/tools_menu/reading_list_menu_view_item.h"
 #import "ios/chrome/browser/ui/tools_menu/tools_menu_constants.h"
 #import "ios/chrome/browser/ui/tools_menu/tools_menu_model.h"
 #import "ios/chrome/browser/ui/tools_menu/tools_menu_view_item.h"
 #import "ios/chrome/browser/ui/tools_menu/tools_menu_view_tools_cell.h"
 #import "ios/chrome/browser/ui/tools_menu/tools_popup_controller.h"
 #include "ios/chrome/browser/ui/ui_util.h"
@@ skipping 99 matching lines @@
 
 @implementation ToolsMenuViewController
 
 @synthesize menuView = _menuView;
 @synthesize isCurrentPageBookmarked = _isCurrentPageBookmarked;
 @synthesize touchFeedbackView = _touchFeedbackView;
 @synthesize isTabLoading = _isTabLoading;
 @synthesize toolbarType = _toolbarType;
 @synthesize menuItems = _menuItems;
 @synthesize delegate = _delegate;
+@synthesize dispatcher = _dispatcher;
 @synthesize requestStartTime = _requestStartTime;
 
 #pragma mark Public methods
 
 - (CGFloat)optimalHeight:(CGFloat)suggestedHeight {
   NSInteger numberOfItems = [self.menuItems count];
   if (_toolbarType == ToolbarTypeWebiPhone) {
     // Account for the height of the first row, not included in |menuItems|.
     numberOfItems++;
   }
@@ skipping 306 matching lines @@
 - (void)hideContent {
   _menuView.alpha = 0;
 
   // Remove the target/action for touching the buttons. VoiceOver may hold on
   // to these buttons after |self| has been released, causing a crash if a
   // button is activated (see http://crbug.com/480974 ).
   UIButton* toolsButton = [[self toolsCell] toolsButton];
   [toolsButton removeTarget:self
                      action:@selector(buttonPressed:)
            forControlEvents:UIControlEventTouchUpInside];
-  for (UIButton* button in [[self toolsCell] allButtons]) {
+  ToolsMenuViewToolsCell* toolsCell = [self toolsCell];
+  for (UIButton* button in [toolsCell allButtons]) {
     [button removeTarget:self
                   action:@selector(buttonPressed:)
         forControlEvents:UIControlEventTouchUpInside];
   }
+  [toolsCell.stopButton removeTarget:self.dispatcher
+                              action:@selector(stopLoading)
+                    forControlEvents:UIControlEventTouchUpInside];
+  [toolsCell.reloadButton removeTarget:self.dispatcher
+                                action:@selector(reload)
+                      forControlEvents:UIControlEventTouchUpInside];
 }
 
 #pragma mark - Button event handling
 
-- (IBAction)buttonPressed:(id)sender {
+- (void)buttonPressed:(id)sender {
   int commandId = [sender tag];
   DCHECK(commandId);
   // The bookmark command workaround is only needed for metrics; remap it
   // to the real command for the dispatch. This is very hacky, but it will go
   // away soon.  See crbug/228521
   DCHECK([sender respondsToSelector:@selector(setTag:)]);
   if (commandId == IDC_TEMP_EDIT_BOOKMARK)
     [sender setTag:IDC_BOOKMARK_PAGE];
   // Do nothing when tapping the tools menu a second time.
-  if (commandId != IDC_SHOW_TOOLS_MENU) {
+  // Do not use -chromeExecuteCommand: for tags < 0 -- that is, items that have
+  // been refactored to use the dispatcher.
+  if (commandId != IDC_SHOW_TOOLS_MENU && commandId > 0) {
     [self chromeExecuteCommand:sender];
   }
   if (commandId == IDC_TEMP_EDIT_BOOKMARK)
     [sender setTag:IDC_TEMP_EDIT_BOOKMARK];
 
+  // Do any metrics logging for the command, and then close the menu.
   [_delegate commandWasSelected:commandId];
 }
 
 #pragma mark - UICollectionViewDelegate Implementation
 
 - (BOOL)collectionView:(ToolsMenuCollectionView*)view
     shouldHighlightItemAtIndexPath:(NSIndexPath*)path {
   if (view.tracking)
     return NO;
   NSInteger item = [self dataIndexForIndexPath:path];
@@ skipping 72 matching lines @@
   return numberOfItems;
 }
 
 - (UICollectionViewCell*)collectionView:(UICollectionView*)view
                  cellForItemAtIndexPath:(NSIndexPath*)path {
   NSInteger item = [self dataIndexForIndexPath:path];
   if (item < 0) {
     ToolsMenuViewToolsCell* cell =
         [view dequeueReusableCellWithReuseIdentifier:kToolsItemCellID
                                         forIndexPath:path];
+    // Add specific target/action dispatch for buttons refactored away from
+    // ChromeExecuteCommand. These need to be added *before* -buttonPressed:,
+    // because -buttonPressed: closes the popup menu, which will usually
+    // destroy the buttons before any other actions can be called.
+    [cell.stopButton addTarget:self.dispatcher
+                        action:@selector(stopLoading)
+              forControlEvents:UIControlEventTouchUpInside];
+    [cell.reloadButton addTarget:self.dispatcher
+                          action:@selector(reload)
+                forControlEvents:UIControlEventTouchUpInside];
     for (UIButton* button in [cell allButtons]) {
       [button addTarget:self
                     action:@selector(buttonPressed:)
           forControlEvents:UIControlEventTouchUpInside];
     }
+
     return cell;
   }
 
   ToolsMenuViewItem* menuItem = [_menuItems objectAtIndex:item];
   ToolsMenuViewCell* menuItemCell =
       [view dequeueReusableCellWithReuseIdentifier:[[menuItem class] cellID]
                                       forIndexPath:path];
   [menuItemCell configureForMenuItem:menuItem];
 
   return menuItemCell;
@@ skipping 18 matching lines @@
 
 - (void)unreadCountChanged:(NSInteger)unreadCount {
   [[self readingListCell] updateBadgeCount:unreadCount animated:YES];
 }
 
 - (void)unseenStateChanged:(BOOL)unseenItemsExist {
   [[self readingListCell] updateSeenState:unseenItemsExist animated:YES];
 }
 
 @end