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

Unified Diff: ios/clean/chrome/browser/ui/tab_grid/tab_grid_coordinator.mm

Issue 2798833003: [ios clean] Updates all BrowserCoordinator to the new rule (Closed)
Patch Set: Fix unittests Created 3 years, 8 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/clean/chrome/browser/ui/tab_grid/BUILD.gn ('k') | ios/clean/chrome/browser/ui/tab_strip/BUILD.gn » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 1598edf5aa85a63fccc5085a7ab2612f5e8a38a8..97487607c9a5169ba586038d07e720175f0fb377 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
@@ -14,7 +14,6 @@
#import "ios/clean/chrome/browser/ui/tab/tab_coordinator.h"
#import "ios/clean/chrome/browser/ui/tab_grid/tab_grid_mediator.h"
#import "ios/clean/chrome/browser/ui/tab_grid/tab_grid_view_controller.h"
-#import "ios/shared/chrome/browser/coordinator_context/coordinator_context.h"
#import "ios/shared/chrome/browser/tabs/web_state_list.h"
#import "ios/shared/chrome/browser/ui/browser_list/browser.h"
#import "ios/shared/chrome/browser/ui/commands/command_dispatcher.h"
@@ -68,8 +67,6 @@
// SettingsCommands
[dispatcher startDispatchingToTarget:self
forSelector:@selector(showSettings)];
- [dispatcher startDispatchingToTarget:self
- forSelector:@selector(closeSettings)];
// TabGridCommands
[dispatcher startDispatchingToTarget:self
forSelector:@selector(showTabGridTabAtIndex:)];
@@ -85,12 +82,6 @@
self.mediator.consumer = self.viewController;
- // |baseViewController| is nullable, so this is by design a no-op if it hasn't
- // been set. This may be true in a unit test, or if this coordinator is being
- // used as a root coordinator.
- [self.context.baseViewController presentViewController:self.viewController
- animated:self.context.animated
- completion:nil];
[super start];
}
@@ -99,6 +90,22 @@
[self.browser->dispatcher() stopDispatchingToTarget:self];
}
+- (void)childCoordinatorDidStart:(BrowserCoordinator*)childCoordinator {
+ DCHECK([childCoordinator isKindOfClass:[SettingsCoordinator class]] ||
+ [childCoordinator isKindOfClass:[TabCoordinator class]]);
+ [self.viewController presentViewController:childCoordinator.viewController
+ animated:YES
+ completion:nil];
+}
+
+- (void)childCoordinatorWillStop:(BrowserCoordinator*)childCoordinator {
+ DCHECK([childCoordinator isKindOfClass:[SettingsCoordinator class]] ||
+ [childCoordinator isKindOfClass:[TabCoordinator class]]);
+ [childCoordinator.viewController.presentingViewController
+ dismissViewControllerAnimated:YES
+ completion:nil];
+}
+
#pragma mark - TabGridCommands
- (void)showTabGridTabAtIndex:(int)index {
« no previous file with comments | « ios/clean/chrome/browser/ui/tab_grid/BUILD.gn ('k') | ios/clean/chrome/browser/ui/tab_strip/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698