| OLD | NEW |
| 1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #import "ios/clean/chrome/browser/ui/tab/tab_coordinator.h" | 5 #import "ios/clean/chrome/browser/ui/tab/tab_coordinator.h" |
| 6 | 6 |
| 7 #include <memory> | 7 #include <memory> |
| 8 | 8 |
| 9 #include "base/mac/foundation_util.h" | 9 #include "base/mac/foundation_util.h" |
| 10 #include "base/memory/ptr_util.h" | 10 #include "base/memory/ptr_util.h" |
| (...skipping 113 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 124 | 124 |
| 125 - (void)childCoordinatorWillStop:(BrowserCoordinator*)childCoordinator { | 125 - (void)childCoordinatorWillStop:(BrowserCoordinator*)childCoordinator { |
| 126 if ([childCoordinator isKindOfClass:[FindInPageCoordinator class]]) { | 126 if ([childCoordinator isKindOfClass:[FindInPageCoordinator class]]) { |
| 127 self.viewController.findBarViewController = nil; | 127 self.viewController.findBarViewController = nil; |
| 128 } else if ([childCoordinator isKindOfClass:[WebCoordinator class]] || | 128 } else if ([childCoordinator isKindOfClass:[WebCoordinator class]] || |
| 129 [childCoordinator isKindOfClass:[NTPCoordinator class]]) { | 129 [childCoordinator isKindOfClass:[NTPCoordinator class]]) { |
| 130 self.viewController.contentViewController = nil; | 130 self.viewController.contentViewController = nil; |
| 131 } | 131 } |
| 132 } | 132 } |
| 133 | 133 |
| 134 - (BOOL)canAddOverlayCoordinator:(BrowserCoordinator*)overlayCoordinator { | |
| 135 // This coordinator will always accept overlay coordinators. | |
| 136 return YES; | |
| 137 } | |
| 138 | |
| 139 #pragma mark - Experiment support | 134 #pragma mark - Experiment support |
| 140 | 135 |
| 141 - (BOOL)usesBottomToolbar { | 136 - (BOOL)usesBottomToolbar { |
| 142 NSUserDefaults* defaults = [NSUserDefaults standardUserDefaults]; | 137 NSUserDefaults* defaults = [NSUserDefaults standardUserDefaults]; |
| 143 NSString* bottomToolbarPreference = | 138 NSString* bottomToolbarPreference = |
| 144 [defaults stringForKey:@"EnableBottomToolbar"]; | 139 [defaults stringForKey:@"EnableBottomToolbar"]; |
| 145 return [bottomToolbarPreference isEqualToString:@"Enabled"]; | 140 return [bottomToolbarPreference isEqualToString:@"Enabled"]; |
| 146 } | 141 } |
| 147 | 142 |
| 148 // Creates and returns a new view controller for use as a tab container; | 143 // Creates and returns a new view controller for use as a tab container; |
| (...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 201 return animator; | 196 return animator; |
| 202 } | 197 } |
| 203 | 198 |
| 204 #pragma mark - TabCommands | 199 #pragma mark - TabCommands |
| 205 | 200 |
| 206 - (void)loadURL:(web::NavigationManager::WebLoadParams)params { | 201 - (void)loadURL:(web::NavigationManager::WebLoadParams)params { |
| 207 self.webState->GetNavigationManager()->LoadURLWithParams(params); | 202 self.webState->GetNavigationManager()->LoadURLWithParams(params); |
| 208 } | 203 } |
| 209 | 204 |
| 210 @end | 205 @end |
| OLD | NEW |