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" |
11 #include "ios/chrome/browser/chrome_url_constants.h" | 11 #include "ios/chrome/browser/chrome_url_constants.h" |
12 #import "ios/clean/chrome/browser/ui/animators/zoom_transition_animator.h" | 12 #import "ios/clean/chrome/browser/ui/animators/zoom_transition_animator.h" |
13 #import "ios/clean/chrome/browser/ui/commands/tab_commands.h" | 13 #import "ios/clean/chrome/browser/ui/commands/tab_commands.h" |
| 14 #import "ios/clean/chrome/browser/ui/find_in_page/find_in_page_coordinator.h" |
14 #import "ios/clean/chrome/browser/ui/ntp/ntp_coordinator.h" | 15 #import "ios/clean/chrome/browser/ui/ntp/ntp_coordinator.h" |
15 #import "ios/clean/chrome/browser/ui/tab/tab_container_view_controller.h" | 16 #import "ios/clean/chrome/browser/ui/tab/tab_container_view_controller.h" |
16 #import "ios/clean/chrome/browser/ui/tab_strip/tab_strip_coordinator.h" | 17 #import "ios/clean/chrome/browser/ui/tab_strip/tab_strip_coordinator.h" |
17 #import "ios/clean/chrome/browser/ui/toolbar/toolbar_coordinator.h" | 18 #import "ios/clean/chrome/browser/ui/toolbar/toolbar_coordinator.h" |
18 #import "ios/clean/chrome/browser/ui/web_contents/web_coordinator.h" | 19 #import "ios/clean/chrome/browser/ui/web_contents/web_coordinator.h" |
19 #import "ios/shared/chrome/browser/ui/browser_list/browser.h" | 20 #import "ios/shared/chrome/browser/ui/browser_list/browser.h" |
20 #import "ios/shared/chrome/browser/ui/commands/command_dispatcher.h" | 21 #import "ios/shared/chrome/browser/ui/commands/command_dispatcher.h" |
21 #import "ios/shared/chrome/browser/ui/coordinators/browser_coordinator+internal.
h" | 22 #import "ios/shared/chrome/browser/ui/coordinators/browser_coordinator+internal.
h" |
22 #import "ios/web/public/web_state/web_state.h" | 23 #import "ios/web/public/web_state/web_state.h" |
23 #import "ios/web/public/web_state/web_state_observer_bridge.h" | 24 #import "ios/web/public/web_state/web_state_observer_bridge.h" |
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
67 webCoordinator.webState = self.webState; | 68 webCoordinator.webState = self.webState; |
68 [self addChildCoordinator:webCoordinator]; | 69 [self addChildCoordinator:webCoordinator]; |
69 [webCoordinator start]; | 70 [webCoordinator start]; |
70 self.webCoordinator = webCoordinator; | 71 self.webCoordinator = webCoordinator; |
71 | 72 |
72 ToolbarCoordinator* toolbarCoordinator = [[ToolbarCoordinator alloc] init]; | 73 ToolbarCoordinator* toolbarCoordinator = [[ToolbarCoordinator alloc] init]; |
73 toolbarCoordinator.webState = self.webState; | 74 toolbarCoordinator.webState = self.webState; |
74 [self addChildCoordinator:toolbarCoordinator]; | 75 [self addChildCoordinator:toolbarCoordinator]; |
75 [toolbarCoordinator start]; | 76 [toolbarCoordinator start]; |
76 | 77 |
| 78 // Create the FindInPage coordinator but do not start it. It will be started |
| 79 // when a find in page operation is invoked. |
| 80 FindInPageCoordinator* findInPageCoordinator = |
| 81 [[FindInPageCoordinator alloc] init]; |
| 82 [self addChildCoordinator:findInPageCoordinator]; |
| 83 |
77 TabStripCoordinator* tabStripCoordinator = [[TabStripCoordinator alloc] init]; | 84 TabStripCoordinator* tabStripCoordinator = [[TabStripCoordinator alloc] init]; |
78 [self addChildCoordinator:tabStripCoordinator]; | 85 [self addChildCoordinator:tabStripCoordinator]; |
79 [tabStripCoordinator start]; | 86 [tabStripCoordinator start]; |
80 | 87 |
81 // PLACEHOLDER: Fix the order of events here. The ntpCoordinator was already | 88 // PLACEHOLDER: Fix the order of events here. The ntpCoordinator was already |
82 // created above when |webCoordinator.webState = self.webState;| triggers | 89 // created above when |webCoordinator.webState = self.webState;| triggers |
83 // a load event, but then the webCoordinator stomps on the | 90 // a load event, but then the webCoordinator stomps on the |
84 // contentViewController when it starts afterwards. | 91 // contentViewController when it starts afterwards. |
85 if (self.webState->GetLastCommittedURL() == GURL(kChromeUINewTabURL)) { | 92 if (self.webState->GetLastCommittedURL() == GURL(kChromeUINewTabURL)) { |
86 self.viewController.contentViewController = | 93 self.viewController.contentViewController = |
(...skipping 16 matching lines...) Expand all Loading... |
103 | 110 |
104 - (void)childCoordinatorDidStart:(BrowserCoordinator*)childCoordinator { | 111 - (void)childCoordinatorDidStart:(BrowserCoordinator*)childCoordinator { |
105 if ([childCoordinator isKindOfClass:[ToolbarCoordinator class]]) { | 112 if ([childCoordinator isKindOfClass:[ToolbarCoordinator class]]) { |
106 self.viewController.toolbarViewController = childCoordinator.viewController; | 113 self.viewController.toolbarViewController = childCoordinator.viewController; |
107 } else if ([childCoordinator isKindOfClass:[WebCoordinator class]] || | 114 } else if ([childCoordinator isKindOfClass:[WebCoordinator class]] || |
108 [childCoordinator isKindOfClass:[NTPCoordinator class]]) { | 115 [childCoordinator isKindOfClass:[NTPCoordinator class]]) { |
109 self.viewController.contentViewController = childCoordinator.viewController; | 116 self.viewController.contentViewController = childCoordinator.viewController; |
110 } else if ([childCoordinator isKindOfClass:[TabStripCoordinator class]]) { | 117 } else if ([childCoordinator isKindOfClass:[TabStripCoordinator class]]) { |
111 self.viewController.tabStripViewController = | 118 self.viewController.tabStripViewController = |
112 childCoordinator.viewController; | 119 childCoordinator.viewController; |
| 120 } else if ([childCoordinator isKindOfClass:[FindInPageCoordinator class]]) { |
| 121 self.viewController.findBarViewController = childCoordinator.viewController; |
113 } | 122 } |
114 } | 123 } |
115 | 124 |
116 - (void)childCoordinatorWillStop:(BrowserCoordinator*)childCoordinator { | 125 - (void)childCoordinatorWillStop:(BrowserCoordinator*)childCoordinator { |
117 self.viewController.contentViewController = nil; | 126 if ([childCoordinator isKindOfClass:[FindInPageCoordinator class]]) { |
| 127 self.viewController.findBarViewController = nil; |
| 128 } else if ([childCoordinator isKindOfClass:[WebCoordinator class]] || |
| 129 [childCoordinator isKindOfClass:[NTPCoordinator class]]) { |
| 130 self.viewController.contentViewController = nil; |
| 131 } |
118 } | 132 } |
119 | 133 |
120 - (BOOL)canAddOverlayCoordinator:(BrowserCoordinator*)overlayCoordinator { | 134 - (BOOL)canAddOverlayCoordinator:(BrowserCoordinator*)overlayCoordinator { |
121 // This coordinator will always accept overlay coordinators. | 135 // This coordinator will always accept overlay coordinators. |
122 return YES; | 136 return YES; |
123 } | 137 } |
124 | 138 |
125 #pragma mark - Experiment support | 139 #pragma mark - Experiment support |
126 | 140 |
127 // Create and return a new view controller for use as a tab container; | 141 // Create and return a new view controller for use as a tab container; |
(...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
180 return animator; | 194 return animator; |
181 } | 195 } |
182 | 196 |
183 #pragma mark - TabCommands | 197 #pragma mark - TabCommands |
184 | 198 |
185 - (void)loadURL:(web::NavigationManager::WebLoadParams)params { | 199 - (void)loadURL:(web::NavigationManager::WebLoadParams)params { |
186 self.webState->GetNavigationManager()->LoadURLWithParams(params); | 200 self.webState->GetNavigationManager()->LoadURLWithParams(params); |
187 } | 201 } |
188 | 202 |
189 @end | 203 @end |
OLD | NEW |