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

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

Issue 2814963002: [ios clean] Use ToolsMenuConfiguration for Menu context. (Closed)
Patch Set: 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
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 f226742d3e16ea2569ecf63d512ca19d3b341ba0..a1ed8dcb25c2933560ed015959ae6368259ceecc 100644
--- a/ios/clean/chrome/browser/ui/tools/menu_view_controller.mm
+++ b/ios/clean/chrome/browser/ui/tools/menu_view_controller.mm
@@ -27,12 +27,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 menuItems = _menuItems;
@synthesize toolbarOverflowStackView = _toolbarOverflowStackView;
@synthesize dispatcher = _dispatcher;
+@synthesize displayOverflowControls = _displayOverflowControls;
- (void)loadView {
CGRect frame;
@@ -76,7 +78,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
@@ -115,4 +118,8 @@ const CGFloat kMenuItemHeight = 48;
_menuItems = menuItems;
}
+- (void)canDisplayOverflowControls:(BOOL)displayOverflowControls {
marq (ping after 24h) 2017/04/12 11:17:07 This depends on device size/format, which is somet
sczs 2017/04/12 15:06:08 This also depends on who is displaying the ToolsMe
marq (ping after 24h) 2017/04/14 10:01:52 Indeed! My mistake.
+ self.displayOverflowControls = displayOverflowControls;
+}
+
@end

Powered by Google App Engine
This is Rietveld 408576698