[iOS Clean] Removed old overlay implementation.

ios/clean/chrome/browser/ui/tab_grid/tab_grid_coordinator.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/tab_grid/tab_grid_coordinator.h"
 
 #include <memory>
 
 #include "base/mac/foundation_util.h"
 #include "base/strings/sys_string_conversions.h"
 #include "ios/chrome/browser/browser_state/chrome_browser_state.h"
 #import "ios/chrome/browser/web_state_list/web_state_list.h"
 #import "ios/clean/chrome/browser/ui/commands/context_menu_commands.h"
 #import "ios/clean/chrome/browser/ui/commands/settings_commands.h"
 #import "ios/clean/chrome/browser/ui/commands/tab_grid_commands.h"
 #import "ios/clean/chrome/browser/ui/commands/tools_menu_commands.h"
 #import "ios/clean/chrome/browser/ui/context_menu/context_menu_context_impl.h"
+#import "ios/clean/chrome/browser/ui/overlays/overlay_service.h"
+#import "ios/clean/chrome/browser/ui/overlays/overlay_service_factory.h"
 #import "ios/clean/chrome/browser/ui/settings/settings_coordinator.h"
 #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/clean/chrome/browser/ui/tools/tools_coordinator.h"
 #import "ios/shared/chrome/browser/ui/browser_list/browser.h"
 #import "ios/shared/chrome/browser/ui/commands/command_dispatcher.h"
 #import "ios/shared/chrome/browser/ui/coordinators/browser_coordinator+internal.h"
 #import "ios/shared/chrome/browser/ui/tools_menu/tools_menu_configuration.h"
 #import "ios/web/public/navigation_manager.h"
@@ skipping 94 matching lines @@
   [self openURL:net::NSURLWithGURL(contextImpl.imageURL)];
 }
 
 #pragma mark - SettingsCommands
 
 - (void)showSettings {
   CommandDispatcher* dispatcher = self.browser->dispatcher();
   [dispatcher startDispatchingToTarget:self
                            forSelector:@selector(closeSettings)];
   SettingsCoordinator* settingsCoordinator = [[SettingsCoordinator alloc] init];
-  [self addOverlayCoordinator:settingsCoordinator];
+  OverlayServiceFactory::GetInstance()

[marq (ping after 24h), 2017/06/21 09:53:19]

This is kind of an unwieldy invocation; can't it be folded into a category
method on BrowserCoordinator?

[kkhorimoto, 2017/06/23 06:22:39]

Done.

+      ->GetForBrowserState(self.browser->browser_state())
+      ->ShowOverlayForBrowser(settingsCoordinator, self, self.browser);
   self.settingsCoordinator = settingsCoordinator;
-  [settingsCoordinator start];
 }
 
 - (void)closeSettings {
   CommandDispatcher* dispatcher = self.browser->dispatcher();
   [dispatcher stopDispatchingForSelector:@selector(closeSettings)];
   [self.settingsCoordinator stop];
-  [self.settingsCoordinator.parentCoordinator
-      removeChildCoordinator:self.settingsCoordinator];
-  // self.settingsCoordinator should be presumed to be nil after this point.
+  // Stopping an overlay added to the OverlayService removes it from the
+  // overlay queue and schedules the next overlay to be shown.  Since
+  // self.settingsController is weak, it is presumed nil after this point.
 }
 
 #pragma mark - TabGridCommands
 
 - (void)showTabGridTabAtIndex:(int)index {
+  if (index == self.webStateList.active_index())
+    return;
   self.webStateList.ActivateWebStateAt(index);
   // PLACEHOLDER: The tab coordinator should be able to get the active webState
   // on its own.
   [self.activeTabCoordinator stop];
   [self removeChildCoordinator:self.activeTabCoordinator];
   TabCoordinator* tabCoordinator = [[TabCoordinator alloc] init];
   self.activeTabCoordinator = tabCoordinator;
   tabCoordinator.webState = self.webStateList.GetWebStateAt(index);
   tabCoordinator.presentationKey =
       [NSIndexPath indexPathForItem:index inSection:0];
@@ skipping 42 matching lines @@
   [self.toolsMenuCoordinator stop];
   [self removeChildCoordinator:self.toolsMenuCoordinator];
 }
 
 #pragma mark - URLOpening
 
 - (void)openURL:(NSURL*)URL {
   if (self.webStateList.active_index() == WebStateList::kInvalidIndex) {
     return;
   }
-  [self.overlayCoordinator stop];
-  [self removeOverlayCoordinator];
+  OverlayServiceFactory::GetInstance()
+      ->GetForBrowserState(self.browser->browser_state())
+      ->CancelOverlays();
   web::WebState* activeWebState = self.webStateList.GetActiveWebState();
   web::NavigationManager::WebLoadParams params(net::GURLWithNSURL(URL));
   params.transition_type = ui::PAGE_TRANSITION_LINK;
   activeWebState->GetNavigationManager()->LoadURLWithParams(params);
   if (!self.children.count) {
     [self showTabGridTabAtIndex:self.webStateList.active_index()];
   }
 }
 
 #pragma mark - PrivateMethods
@@ skipping 10 matching lines @@
       startDispatchingToTarget:self
                    forSelector:@selector(openContextMenuImageInNewTab:)];
 }
 
 - (void)registerForSettingsCommands {
   [self.browser->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()
-      startDispatchingToTarget:self
-                   forSelector:@selector(createAndShowNewTabInTabGrid)];
+                   forProtocol:@protocol(TabGridCommands)];
 }
 
 - (void)registerForToolsMenuCommands {
   [self.browser->dispatcher()
       startDispatchingToTarget:self
                    forSelector:@selector(showToolsMenu)];
   [self.browser->dispatcher()
       startDispatchingToTarget:self
                    forSelector:@selector(closeToolsMenu)];
 }
 
 - (void)deRegisterFromToolsMenuCommands {
   [self.browser->dispatcher()
       stopDispatchingForSelector:@selector(showToolsMenu)];
   [self.browser->dispatcher()
       stopDispatchingForSelector:@selector(closeToolsMenu)];
 }
 
 @end