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/toolbar/toolbar_coordinator.h" | 5 #import "ios/clean/chrome/browser/ui/toolbar/toolbar_coordinator.h" |
6 | 6 |
7 #import "ios/clean/chrome/browser/ui/commands/tools_menu_commands.h" | 7 #import "ios/clean/chrome/browser/ui/commands/tools_menu_commands.h" |
8 #import "ios/clean/chrome/browser/ui/omnibox/location_bar_coordinator.h" | 8 #import "ios/clean/chrome/browser/ui/omnibox/location_bar_coordinator.h" |
9 #import "ios/clean/chrome/browser/ui/toolbar/toolbar_mediator.h" | 9 #import "ios/clean/chrome/browser/ui/toolbar/toolbar_mediator.h" |
10 #import "ios/clean/chrome/browser/ui/toolbar/toolbar_view_controller.h" | 10 #import "ios/clean/chrome/browser/ui/toolbar/toolbar_view_controller.h" |
11 #import "ios/clean/chrome/browser/ui/tools/tools_coordinator.h" | 11 #import "ios/clean/chrome/browser/ui/tools/tools_coordinator.h" |
12 #import "ios/shared/chrome/browser/ui/browser_list/browser.h" | 12 #import "ios/shared/chrome/browser/ui/browser_list/browser.h" |
13 #import "ios/shared/chrome/browser/ui/commands/command_dispatcher.h" | 13 #import "ios/shared/chrome/browser/ui/commands/command_dispatcher.h" |
14 #import "ios/shared/chrome/browser/ui/coordinators/browser_coordinator+internal.
h" | 14 #import "ios/shared/chrome/browser/ui/coordinators/browser_coordinator+internal.
h" |
| 15 #import "ios/shared/chrome/browser/ui/tools_menu/tools_menu_configuration.h" |
15 #import "ios/web/public/navigation_manager.h" | 16 #import "ios/web/public/navigation_manager.h" |
16 #include "ios/web/public/web_state/web_state.h" | 17 #include "ios/web/public/web_state/web_state.h" |
17 | 18 |
18 #if !defined(__has_feature) || !__has_feature(objc_arc) | 19 #if !defined(__has_feature) || !__has_feature(objc_arc) |
19 #error "This file requires ARC support." | 20 #error "This file requires ARC support." |
20 #endif | 21 #endif |
21 | 22 |
22 @interface ToolbarCoordinator ()<ToolsMenuCommands> | 23 @interface ToolbarCoordinator ()<ToolsMenuCommands> |
23 @property(nonatomic, weak) LocationBarCoordinator* locationBarCoordinator; | 24 @property(nonatomic, weak) LocationBarCoordinator* locationBarCoordinator; |
24 @property(nonatomic, weak) ToolsCoordinator* toolsMenuCoordinator; | 25 @property(nonatomic, weak) ToolsCoordinator* toolsMenuCoordinator; |
(...skipping 68 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
93 dismissViewControllerAnimated:YES | 94 dismissViewControllerAnimated:YES |
94 completion:nil]; | 95 completion:nil]; |
95 } | 96 } |
96 } | 97 } |
97 | 98 |
98 #pragma mark - ToolsMenuCommands Implementation | 99 #pragma mark - ToolsMenuCommands Implementation |
99 | 100 |
100 - (void)showToolsMenu { | 101 - (void)showToolsMenu { |
101 ToolsCoordinator* toolsCoordinator = [[ToolsCoordinator alloc] init]; | 102 ToolsCoordinator* toolsCoordinator = [[ToolsCoordinator alloc] init]; |
102 [self addChildCoordinator:toolsCoordinator]; | 103 [self addChildCoordinator:toolsCoordinator]; |
| 104 ToolsMenuConfiguration* menuConfiguration = |
| 105 [[ToolsMenuConfiguration alloc] initWithDisplayView:nil]; |
| 106 menuConfiguration.inTabSwitcher = NO; |
| 107 toolsCoordinator.toolsMenuConfiguration = menuConfiguration; |
103 [toolsCoordinator start]; | 108 [toolsCoordinator start]; |
104 self.toolsMenuCoordinator = toolsCoordinator; | 109 self.toolsMenuCoordinator = toolsCoordinator; |
105 } | 110 } |
106 | 111 |
107 - (void)closeToolsMenu { | 112 - (void)closeToolsMenu { |
108 [self.toolsMenuCoordinator stop]; | 113 [self.toolsMenuCoordinator stop]; |
109 [self removeChildCoordinator:self.toolsMenuCoordinator]; | 114 [self removeChildCoordinator:self.toolsMenuCoordinator]; |
110 } | 115 } |
111 | 116 |
112 // PLACEHOLDER: These will move to an object that handles navigation. | 117 // PLACEHOLDER: These will move to an object that handles navigation. |
(...skipping 14 matching lines...) Expand all Loading... |
127 - (void)stopLoadingPage { | 132 - (void)stopLoadingPage { |
128 self.webState->Stop(); | 133 self.webState->Stop(); |
129 } | 134 } |
130 | 135 |
131 - (void)reloadPage { | 136 - (void)reloadPage { |
132 self.webState->GetNavigationManager()->Reload(web::ReloadType::NORMAL, | 137 self.webState->GetNavigationManager()->Reload(web::ReloadType::NORMAL, |
133 false /*check_for_repost*/); | 138 false /*check_for_repost*/); |
134 } | 139 } |
135 | 140 |
136 @end | 141 @end |
OLD | NEW |