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

Unified Diff: ios/chrome/browser/ui/browser_view_controller.mm

Issue 2970553002: [ios] Remove IDC_CLOSE_TAB
Patch Set: Add comment for chrome_test_util.h" 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ios/chrome/browser/ui/browser_view_controller.h ('k') | ios/chrome/browser/ui/commands/BUILD.gn » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ios/chrome/browser/ui/browser_view_controller.mm
diff --git a/ios/chrome/browser/ui/browser_view_controller.mm b/ios/chrome/browser/ui/browser_view_controller.mm
index ea57dee59b277b42bfb16e84c8865f80bcac71a7..f38b972e1e7d110dd6eec72cfccf99620852bfb6 100644
--- a/ios/chrome/browser/ui/browser_view_controller.mm
+++ b/ios/chrome/browser/ui/browser_view_controller.mm
@@ -93,6 +93,7 @@
#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"
@@ -958,6 +959,9 @@ class BrowserBookmarkModelBridge : public bookmarks::BookmarkModelObserver {
[_dispatcher startDispatchingToTarget:self
forSelector:@selector(chromeExecuteCommand:)];
+ [_dispatcher startDispatchingToTarget:self
+ forProtocol:@protocol(BrowserCommands)];
+
_javaScriptDialogPresenter.reset(
new JavaScriptDialogPresenterImpl(_dialogPresenter));
_webStateDelegate.reset(new web::WebStateDelegateBridge(self));
@@ -998,6 +1002,10 @@ class BrowserBookmarkModelBridge : public bookmarks::BookmarkModelObserver {
#pragma mark - Properties
+- (id<BrowserCommands>)browserCommandDispatcher {
+ return static_cast<id<BrowserCommands>>(_dispatcher);
+}
+
- (void)setActive:(BOOL)active {
if (_active == active) {
return;
@@ -2969,7 +2977,7 @@ class BrowserBookmarkModelBridge : public bookmarks::BookmarkModelObserver {
[self newTab:nil];
break;
case OverscrollAction::CLOSE_TAB:
- [self closeCurrentTab];
+ [self.browserCommandDispatcher closeCurrentTab];
break;
case OverscrollAction::REFRESH: {
if ([[[_model currentTab] webController] loadPhase] ==
@@ -3706,8 +3714,9 @@ class BrowserBookmarkModelBridge : public bookmarks::BookmarkModelObserver {
return nil;
}
return [self.keyCommandsProvider
- keyCommandsForConsumer:self
- editingText:![self isFirstResponder]];
+ keyCommandsForConsumer:self
+ browserCommandDispatcher:self.browserCommandDispatcher
+ editingText:![self isFirstResponder]];
}
#pragma mark -
@@ -4024,9 +4033,6 @@ class BrowserBookmarkModelBridge : public bookmarks::BookmarkModelObserver {
inView:[_toolbarController bookmarkButtonView]
originRect:[_toolbarController bookmarkButtonAnchorRect]];
break;
- case IDC_CLOSE_TAB:
- [self closeCurrentTab];
- break;
case IDC_FIND:
[self initFindBarForTab];
break;
« no previous file with comments | « ios/chrome/browser/ui/browser_view_controller.h ('k') | ios/chrome/browser/ui/commands/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698