[ios] Use dispatcher for ToolsMenu commands.

ios/clean/chrome/browser/ui/toolbar/toolbar_view_controller.mm

 // Copyright 2016 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/clean/chrome/browser/ui/toolbar/toolbar_view_controller.h"
 
 #import "base/mac/foundation_util.h"
 #import "ios/clean/chrome/browser/ui/actions/tab_grid_actions.h"
 #import "ios/clean/chrome/browser/ui/actions/tab_strip_actions.h"
-#import "ios/clean/chrome/browser/ui/actions/tools_menu_actions.h"
 #import "ios/clean/chrome/browser/ui/commands/navigation_commands.h"
-#import "ios/clean/chrome/browser/ui/commands/toolbar_commands.h"
+#import "ios/clean/chrome/browser/ui/commands/tools_menu_commands.h"
 #import "ios/clean/chrome/browser/ui/toolbar/toolbar_button+factory.h"
 #import "ios/clean/chrome/browser/ui/toolbar/toolbar_component_options.h"
 
 #if !defined(__has_feature) || !__has_feature(objc_arc)
 #error "This file requires ARC support."
 #endif
 
 namespace {
 // Stackview Vertical Margin.
 CGFloat kVerticalMargin = 5.0f;
 // Stackview Horizontal Margin.
 CGFloat kHorizontalMargin = 8.0f;
 }  // namespace
 
-@interface ToolbarViewController ()<ToolsMenuActions>
+@interface ToolbarViewController ()
 @property(nonatomic, strong) UITextField* omnibox;
 @property(nonatomic, strong) UIStackView* stackView;
 @property(nonatomic, strong) ToolbarButton* backButton;
 @property(nonatomic, strong) ToolbarButton* forwardButton;
 @property(nonatomic, strong) ToolbarButton* tabSwitchStripButton;
 @property(nonatomic, strong) ToolbarButton* tabSwitchGridButton;
 @property(nonatomic, strong) ToolbarButton* toolsMenuButton;
 @property(nonatomic, strong) ToolbarButton* shareButton;
 @property(nonatomic, strong) ToolbarButton* reloadButton;
 @property(nonatomic, strong) ToolbarButton* stopButton;
@@ skipping 94 matching lines @@
       ToolbarComponentVisibilityRegularWidth;
   [self.tabSwitchGridButton addTarget:nil
                                action:@selector(showTabGrid:)
                      forControlEvents:UIControlEventTouchUpInside];
   self.tabSwitchGridButton.hiddenInCurrentState = YES;
 
   // Tools menu button.
   self.toolsMenuButton = [ToolbarButton toolsMenuToolbarButton];
   self.toolsMenuButton.visibilityMask = ToolbarComponentVisibilityCompactWidth |
                                         ToolbarComponentVisibilityRegularWidth;
-  [self.toolsMenuButton addTarget:nil
+  [self.toolsMenuButton addTarget:self
                            action:@selector(showToolsMenu:)
                  forControlEvents:UIControlEventTouchUpInside];
 
   // Share button.
   self.shareButton = [ToolbarButton shareToolbarButton];
   self.shareButton.visibilityMask = ToolbarComponentVisibilityRegularWidth;
-  [self.shareButton addTarget:nil
+  [self.shareButton addTarget:self
                        action:@selector(showShareMenu:)
              forControlEvents:UIControlEventTouchUpInside];
 
   // Reload button.
   self.reloadButton = [ToolbarButton reloadToolbarButton];
   self.reloadButton.visibilityMask = ToolbarComponentVisibilityRegularWidth;
   [self.reloadButton addTarget:self
                         action:@selector(reload:)
               forControlEvents:UIControlEventTouchUpInside];
 
@@ skipping 40 matching lines @@
   [self updateAllButtonsVisibility];
 }
 
 #pragma mark - ZoomTransitionDelegate
 
 - (CGRect)rectForZoomWithKey:(NSObject*)key inView:(UIView*)view {
   return [view convertRect:self.toolsMenuButton.bounds
                   fromView:self.toolsMenuButton];
 }
 
-#pragma mark - ToolsMenuActions
+#pragma mark - ToolsMenuCommands

[edchin, 2017/03/31 02:44:57]

These methods can just be marked as Private methods. 
They aren't actually implementations of the ToolsMenuCommands.

[sczs, 2017/03/31 17:32:57]

I like the idea, thanks! Done.

 
 - (void)showToolsMenu:(id)sender {
   [self.dispatcher showToolsMenu];
 }
 
 - (void)closeToolsMenu:(id)sender {
   [self.dispatcher closeToolsMenu];
 }
 
-#pragma mark - NavigationActions
+- (void)showShareMenu:(id)sender {
+  [self.dispatcher showShareMenu];
+}
+
+#pragma mark - NavigationCommands
 
 - (void)goBack:(id)sender {
   [self.dispatcher goBack];
 }
 
 - (void)goForward:(id)sender {
   [self.dispatcher goForward];
 }
 
 - (void)stop:(id)sender {
@@ skipping 13 matching lines @@
 }
 
 - (void)tabStripDidHide:(id)sender {
   self.tabSwitchStripButton.hiddenInCurrentState = NO;
   self.tabSwitchGridButton.hiddenInCurrentState = YES;
   [self updateAllButtonsVisibility];
 }
 
 #pragma mark - Helper Methods
 
-// PLACEHOLDER: We are not sure yet how WebState changes will affect Toolbar
-// Buttons, but the VC will eventually set the flag on the ToolbarButton
-// indicating it could or not it should be hidden. Once this is done we will
-// update all the ToolbarButtons visibility.
 // Updates all Buttons visibility to match any recent WebState change.
 - (void)updateAllButtonsVisibility {
   for (UIView* view in self.stackView.arrangedSubviews) {
     if ([view isKindOfClass:[ToolbarButton class]]) {
       ToolbarButton* button = base::mac::ObjCCastStrict<ToolbarButton>(view);
       [button setHiddenForCurrentStateAndSizeClass];
     }
   }
 }
 
 @end