[ios] Remove IDC_CLOSE_TAB

ios/chrome/browser/ui/browser_view_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/browser_view_controller.h"
 
 #import <AssetsLibrary/AssetsLibrary.h>
 #import <MobileCoreServices/MobileCoreServices.h>
 #import <PassKit/PassKit.h>
 #import <Photos/Photos.h>
@@ skipping 75 matching lines @@
 #import "ios/chrome/browser/ui/activity_services/share_to_data.h"
 #import "ios/chrome/browser/ui/activity_services/share_to_data_builder.h"
 #import "ios/chrome/browser/ui/alert_coordinator/alert_coordinator.h"
 #import "ios/chrome/browser/ui/authentication/re_signin_infobar_delegate.h"
 #import "ios/chrome/browser/ui/background_generator.h"
 #import "ios/chrome/browser/ui/bookmarks/bookmark_interaction_controller.h"
 #import "ios/chrome/browser/ui/browser_container_view.h"
 #import "ios/chrome/browser/ui/browser_view_controller_dependency_factory.h"
 #import "ios/chrome/browser/ui/chrome_web_view_factory.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/commands/open_url_command.h"
 #import "ios/chrome/browser/ui/commands/reading_list_add_command.h"
 #import "ios/chrome/browser/ui/commands/show_mail_composer_command.h"
 #import "ios/chrome/browser/ui/context_menu/context_menu_coordinator.h"
 #import "ios/chrome/browser/ui/contextual_search/contextual_search_controller.h"
 #import "ios/chrome/browser/ui/contextual_search/contextual_search_mask_view.h"
 #import "ios/chrome/browser/ui/contextual_search/contextual_search_metrics.h"
 #import "ios/chrome/browser/ui/contextual_search/contextual_search_panel_protocols.h"
@@ skipping 845 matching lines @@
     _dialogPresenter = [[DialogPresenter alloc] initWithDelegate:self
                                         presentingViewController:self];
     _dispatcher = [[CommandDispatcher alloc] init];
     [_dispatcher startDispatchingToTarget:self
                               forProtocol:@protocol(UrlLoader)];
     [_dispatcher startDispatchingToTarget:self
                               forProtocol:@protocol(WebToolbarDelegate)];
     [_dispatcher startDispatchingToTarget:self
                               forSelector:@selector(chromeExecuteCommand:)];
 
+    [_dispatcher startDispatchingToTarget:self
+                              forProtocol:@protocol(BrowserCommands)];
+
     _javaScriptDialogPresenter.reset(
         new JavaScriptDialogPresenterImpl(_dialogPresenter));
     _webStateDelegate.reset(new web::WebStateDelegateBridge(self));
     // TODO(leng): Delay this.
     [[UpgradeCenter sharedInstance] registerClient:self];
     _inNewTabAnimation = NO;
     if (model && browserState)
       [self updateWithTabModel:model browserState:browserState];
     if ([[NSUserDefaults standardUserDefaults]
             boolForKey:@"fullScreenShowAlert"]) {
@@ skipping 20 matching lines @@
 
 #pragma mark - Accessibility
 
 - (BOOL)accessibilityPerformEscape {
   [self dismissPopups];
   return YES;
 }
 
 #pragma mark - Properties
 
+- (id<BrowserCommands>)browserCommandDispatcher {
+  return static_cast<id<BrowserCommands>>(_dispatcher);
+}
+
 - (void)setActive:(BOOL)active {
   if (_active == active) {
     return;
   }
   _active = active;
 
   // If not active, display an activity indicator overlay over the view to
   // prevent interaction with the web page.
   // TODO(crbug.com/637093): This coordinator should be managed by the
   // coordinator used to present BrowserViewController, when implemented.
@@ skipping 1951 matching lines @@
 
 #pragma mark - OverscrollActionsControllerDelegate methods.
 
 - (void)overscrollActionsController:(OverscrollActionsController*)controller
                    didTriggerAction:(OverscrollAction)action {
   switch (action) {
     case OverscrollAction::NEW_TAB:
       [self newTab:nil];
       break;
     case OverscrollAction::CLOSE_TAB:
-      [self closeCurrentTab];
+      [self.browserCommandDispatcher closeCurrentTab];
       break;
     case OverscrollAction::REFRESH: {
       if ([[[_model currentTab] webController] loadPhase] ==
           web::PAGE_LOADING) {
         [_model currentTab].webState->Stop();
       }
 
       web::WebState* webState = [_model currentTab].webState;
       if (webState)
         // |check_for_repost| is true because the reload is explicitly initiated
@@ skipping 716 matching lines @@
   [_toolbarController focusOmnibox];
 }
 
 #pragma mark - UIResponder
 
 - (NSArray*)keyCommands {
   if (![self shouldRegisterKeyboardCommands]) {
     return nil;
   }
   return [self.keyCommandsProvider
-      keyCommandsForConsumer:self
-                 editingText:![self isFirstResponder]];
+        keyCommandsForConsumer:self
+      browserCommandDispatcher:self.browserCommandDispatcher
+                   editingText:![self isFirstResponder]];
 }
 
 #pragma mark -
 
 // Induce an intentional crash in the browser process.
 - (void)induceBrowserCrash {
   CHECK(false);
   // Call another function, so that the above CHECK can't be tail-call
   // optimized. This ensures that this method's name will show up in the stack
   // for easier identification.
@@ skipping 296 matching lines @@
       [[_model currentTab] goBack];
       break;
     case IDC_BOOKMARK_PAGE:
       [self initializeBookmarkInteractionController];
       [_bookmarkInteractionController
           presentBookmarkForTab:[_model currentTab]
             currentlyBookmarked:_toolbarModelIOS->IsCurrentTabBookmarkedByUser()
                          inView:[_toolbarController bookmarkButtonView]
                      originRect:[_toolbarController bookmarkButtonAnchorRect]];
       break;
-    case IDC_CLOSE_TAB:
-      [self closeCurrentTab];
-      break;
     case IDC_FIND:
       [self initFindBarForTab];
       break;
     case IDC_FIND_NEXT: {
       DCHECK(currentTab);
       // TODO(crbug.com/603524): Reshow find bar if necessary.
       FindTabHelper::FromWebState(currentTab.webState)
           ->ContinueFinding(FindTabHelper::FORWARD, ^(FindInPageModel* model) {
             [_findBarController updateResultsCount:model];
           });
@@ skipping 1181 matching lines @@
 
 - (UIView*)voiceSearchButton {
   return _voiceSearchButton;
 }
 
 - (id<LogoAnimationControllerOwner>)logoAnimationControllerOwner {
   return [self currentLogoAnimationControllerOwner];
 }
 
 @end