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

Unified Diff: ios/chrome/browser/ui/stack_view/stack_view_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/stack_view/stack_view_controller.mm
diff --git a/ios/chrome/browser/ui/stack_view/stack_view_controller.mm b/ios/chrome/browser/ui/stack_view/stack_view_controller.mm
index 4caddb22be2d176a23e00b6e757b6e95cd13e520..2dabb01b3b8b8e71a5568ec758f8950f9b8a035a 100644
--- a/ios/chrome/browser/ui/stack_view/stack_view_controller.mm
+++ b/ios/chrome/browser/ui/stack_view/stack_view_controller.mm
@@ -48,7 +48,7 @@
#import "ios/chrome/browser/ui/stack_view/title_label.h"
#import "ios/chrome/browser/ui/toolbar/new_tab_button.h"
#import "ios/chrome/browser/ui/toolbar/toolbar_owner.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_menu_view_item.h"
#import "ios/chrome/browser/ui/ui_util.h"
#import "ios/chrome/browser/ui/uikit_ui_util.h"
@@ -2716,17 +2716,17 @@ - (IBAction)chromeExecuteCommand:(id)sender {
}
- (void)showToolsMenuPopup {
- base::scoped_nsobject<ToolsMenuContext> context(
- [[ToolsMenuContext alloc] initWithDisplayView:[self view]]);
- [context setInTabSwitcher:YES];
+ base::scoped_nsobject<ToolsMenuConfiguration> configuration(
+ [[ToolsMenuConfiguration alloc] initWithDisplayView:[self view]]);
+ [configuration setInTabSwitcher:YES];
// When checking for the existence of tabs, catch the case where the main set
// is both active and empty, but the incognito set has some cards.
if (([[_activeCardSet cards] count] == 0) &&
(_activeCardSet == _otrCardSet || [[_otrCardSet cards] count] == 0))
- [context setNoOpenedTabs:YES];
+ [configuration setNoOpenedTabs:YES];
if (_activeCardSet == _otrCardSet)
- [context setInIncognito:YES];
- [_toolbarController showToolsMenuPopupWithContext:context];
+ [configuration setInIncognito:YES];
+ [_toolbarController showToolsMenuPopupWithConfiguration:configuration];
}
#pragma mark Notification Handlers

Powered by Google App Engine
This is Rietveld 408576698