| Index: ios/clean/chrome/browser/ui/tab_grid/tab_grid_coordinator.mm
|
| diff --git a/ios/clean/chrome/browser/ui/tab_grid/tab_grid_coordinator.mm b/ios/clean/chrome/browser/ui/tab_grid/tab_grid_coordinator.mm
|
| index 104978959777a314246cb43c5cda533d5725bd58..415794693e454680dd25cf11eb885e167879449d 100644
|
| --- a/ios/clean/chrome/browser/ui/tab_grid/tab_grid_coordinator.mm
|
| +++ b/ios/clean/chrome/browser/ui/tab_grid/tab_grid_coordinator.mm
|
| @@ -70,7 +70,7 @@
|
| [self registerForToolsMenuCommands];
|
|
|
| self.viewController = [[TabGridViewController alloc] init];
|
| - self.viewController.dispatcher = static_cast<id>(self.browser->dispatcher());
|
| + self.viewController.dispatcher = static_cast<id>(self.dispatcher);
|
|
|
| self.mediator.consumer = self.viewController;
|
|
|
| @@ -79,7 +79,7 @@
|
|
|
| - (void)stop {
|
| [super stop];
|
| - [self.browser->dispatcher() stopDispatchingToTarget:self];
|
| + [self.dispatcher stopDispatchingToTarget:self];
|
| [self.mediator disconnect];
|
| // PLACEHOLDER: Remove child coordinators here for now. This might be handled
|
| // differently later on.
|
| @@ -125,7 +125,7 @@
|
| #pragma mark - SettingsCommands
|
|
|
| - (void)showSettings {
|
| - CommandDispatcher* dispatcher = self.browser->dispatcher();
|
| + CommandDispatcher* dispatcher = self.dispatcher;
|
| [dispatcher startDispatchingToTarget:self
|
| forSelector:@selector(closeSettings)];
|
| SettingsCoordinator* settingsCoordinator = [[SettingsCoordinator alloc] init];
|
| @@ -135,7 +135,7 @@
|
| }
|
|
|
| - (void)closeSettings {
|
| - CommandDispatcher* dispatcher = self.browser->dispatcher();
|
| + CommandDispatcher* dispatcher = self.dispatcher;
|
| [dispatcher stopDispatchingForSelector:@selector(closeSettings)];
|
| [self.settingsCoordinator stop];
|
| [self.settingsCoordinator.parentCoordinator
|
| @@ -226,47 +226,41 @@
|
| // implemented, these commands will need to be unregistered before switching
|
| // to incognito mode, as "open in new tab" commands are meant to be handled
|
| // by the incognito TabGridCoordinator.
|
| - [self.browser->dispatcher()
|
| + [self.dispatcher
|
| startDispatchingToTarget:self
|
| forSelector:@selector(openContextMenuLinkInNewTab:)];
|
| - [self.browser->dispatcher()
|
| + [self.dispatcher
|
| startDispatchingToTarget:self
|
| forSelector:@selector(openContextMenuImageInNewTab:)];
|
| }
|
|
|
| - (void)registerForSettingsCommands {
|
| - [self.browser->dispatcher() startDispatchingToTarget:self
|
| - forSelector:@selector(showSettings)];
|
| + [self.dispatcher startDispatchingToTarget:self
|
| + forSelector:@selector(showSettings)];
|
| }
|
|
|
| - (void)registerForTabGridCommands {
|
| - [self.browser->dispatcher() startDispatchingToTarget:self
|
| - forSelector:@selector(showTabGrid)];
|
| - [self.browser->dispatcher()
|
| - startDispatchingToTarget:self
|
| - forSelector:@selector(showTabGridTabAtIndex:)];
|
| - [self.browser->dispatcher()
|
| - startDispatchingToTarget:self
|
| - forSelector:@selector(closeTabGridTabAtIndex:)];
|
| - [self.browser->dispatcher()
|
| + [self.dispatcher startDispatchingToTarget:self
|
| + forSelector:@selector(showTabGrid)];
|
| + [self.dispatcher startDispatchingToTarget:self
|
| + forSelector:@selector(showTabGridTabAtIndex:)];
|
| + [self.dispatcher startDispatchingToTarget:self
|
| + forSelector:@selector(closeTabGridTabAtIndex:)];
|
| + [self.dispatcher
|
| startDispatchingToTarget:self
|
| forSelector:@selector(createAndShowNewTabInTabGrid)];
|
| }
|
|
|
| - (void)registerForToolsMenuCommands {
|
| - [self.browser->dispatcher()
|
| - startDispatchingToTarget:self
|
| - forSelector:@selector(showToolsMenu)];
|
| - [self.browser->dispatcher()
|
| - startDispatchingToTarget:self
|
| - forSelector:@selector(closeToolsMenu)];
|
| + [self.dispatcher startDispatchingToTarget:self
|
| + forSelector:@selector(showToolsMenu)];
|
| + [self.dispatcher startDispatchingToTarget:self
|
| + forSelector:@selector(closeToolsMenu)];
|
| }
|
|
|
| - (void)deRegisterFromToolsMenuCommands {
|
| - [self.browser->dispatcher()
|
| - stopDispatchingForSelector:@selector(showToolsMenu)];
|
| - [self.browser->dispatcher()
|
| - stopDispatchingForSelector:@selector(closeToolsMenu)];
|
| + [self.dispatcher stopDispatchingForSelector:@selector(showToolsMenu)];
|
| + [self.dispatcher stopDispatchingForSelector:@selector(closeToolsMenu)];
|
| }
|
|
|
| @end
|
|
|