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

Unified Diff: ios/chrome/browser/ui/toolbar/toolbar_controller.mm

Issue 2714813002: [iOS] Add Request Mobile Site cell to tools menu (Closed)
Patch Set: Fix unit test Created 3 years, 9 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
Index: ios/chrome/browser/ui/toolbar/toolbar_controller.mm
diff --git a/ios/chrome/browser/ui/toolbar/toolbar_controller.mm b/ios/chrome/browser/ui/toolbar/toolbar_controller.mm
index a19efd3c3f41b5b8d98925fe731119288f107dd3..3eb51c61eca69a187f4aed516de3ddd5dea89ae4 100644
--- a/ios/chrome/browser/ui/toolbar/toolbar_controller.mm
+++ b/ios/chrome/browser/ui/toolbar/toolbar_controller.mm
@@ -27,7 +27,7 @@
#include "ios/chrome/browser/ui/toolbar/toolbar_resource_macros.h"
#import "ios/chrome/browser/ui/toolbar/toolbar_tools_menu_button.h"
#import "ios/chrome/browser/ui/toolbar/tools_menu_button_observer_bridge.h"
-#import "ios/chrome/browser/ui/tools_menu/tools_menu_context.h"
+#import "ios/chrome/browser/ui/tools_menu/tools_menu_configuration.h"
#import "ios/chrome/browser/ui/tools_menu/tools_popup_controller.h"
#import "ios/chrome/browser/ui/uikit_ui_util.h"
#import "ios/chrome/common/material_timing.h"
@@ -588,7 +588,8 @@ - (UIView*)shareButtonView {
return shareButton_.get();
}
-- (void)showToolsMenuPopupWithContext:(ToolsMenuContext*)context {
+- (void)showToolsMenuPopupWithConfiguration:
+ (ToolsMenuConfiguration*)configuration {
// Because an animation hides and shows the tools popup menu it is possible to
// tap the tools button multiple times before the tools menu is shown. Ignore
// repeated taps between animations.
@@ -600,9 +601,9 @@ - (void)showToolsMenuPopupWithContext:(ToolsMenuContext*)context {
// Keep the button pressed.
[toolsMenuButton_ setToolsMenuIsVisible:YES];
- [context setToolsMenuButton:toolsMenuButton_];
+ [configuration setToolsMenuButton:toolsMenuButton_];
toolsPopupController_.reset(
- [[ToolsPopupController alloc] initWithContext:context]);
+ [[ToolsPopupController alloc] initWithConfiguration:configuration]);
[toolsPopupController_ setDelegate:self];

Powered by Google App Engine
This is Rietveld 408576698