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

Unified Diff: ios/clean/chrome/browser/ui/tools/menu_view_controller.mm

Issue 2814963002: [ios clean] Use ToolsMenuConfiguration for Menu context. (Closed)
Patch Set: Update Unittest Created 3 years, 8 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
« no previous file with comments | « ios/clean/chrome/browser/ui/tools/BUILD.gn ('k') | ios/clean/chrome/browser/ui/tools/tools_consumer.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ios/clean/chrome/browser/ui/tools/menu_view_controller.mm
diff --git a/ios/clean/chrome/browser/ui/tools/menu_view_controller.mm b/ios/clean/chrome/browser/ui/tools/menu_view_controller.mm
index 0c2940a53a668ea7fbc9c8e2e51ade1e45b1b644..3810f1c3d552cd37daa26d5f426d7e3f922da931 100644
--- a/ios/clean/chrome/browser/ui/tools/menu_view_controller.mm
+++ b/ios/clean/chrome/browser/ui/tools/menu_view_controller.mm
@@ -29,12 +29,14 @@ const CGFloat kMenuItemHeight = 48;
@property(nonatomic, strong) NSArray<ToolsMenuItem*>* menuItems;
@property(nonatomic, strong)
MenuOverflowControlsStackView* toolbarOverflowStackView;
+@property(nonatomic, assign) BOOL displayOverflowControls;
@end
@implementation MenuViewController
@synthesize dispatcher = _dispatcher;
@synthesize menuItems = _menuItems;
@synthesize toolbarOverflowStackView = _toolbarOverflowStackView;
+@synthesize displayOverflowControls = _displayOverflowControls;
- (void)loadView {
CGRect frame;
@@ -79,7 +81,8 @@ const CGFloat kMenuItemHeight = 48;
// Stack view to hold overflow ToolbarButtons.
if (self.traitCollection.horizontalSizeClass ==
- UIUserInterfaceSizeClassCompact) {
+ UIUserInterfaceSizeClassCompact &&
+ self.displayOverflowControls) {
self.toolbarOverflowStackView =
[[MenuOverflowControlsStackView alloc] init];
// PLACEHOLDER: ToolsMenuButton might end up being part of the MenuVC's view
@@ -122,4 +125,8 @@ const CGFloat kMenuItemHeight = 48;
_menuItems = menuItems;
}
+- (void)displayOverflowControls:(BOOL)displayOverflowControls {
+ self.displayOverflowControls = displayOverflowControls;
+}
+
@end
« no previous file with comments | « ios/clean/chrome/browser/ui/tools/BUILD.gn ('k') | ios/clean/chrome/browser/ui/tools/tools_consumer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698