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

Side by Side Diff: chrome/browser/ui/cocoa/toolbar/toolbar_controller.h

Issue 1886903002: [Mac] Restore menu position for buttons after Material Design changes. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 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 unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 #ifndef CHROME_BROWSER_UI_COCOA_TOOLBAR_TOOLBAR_CONTROLLER_H_ 5 #ifndef CHROME_BROWSER_UI_COCOA_TOOLBAR_TOOLBAR_CONTROLLER_H_
6 #define CHROME_BROWSER_UI_COCOA_TOOLBAR_TOOLBAR_CONTROLLER_H_ 6 #define CHROME_BROWSER_UI_COCOA_TOOLBAR_TOOLBAR_CONTROLLER_H_
7 7
8 #import <Cocoa/Cocoa.h> 8 #import <Cocoa/Cocoa.h>
9 9
10 #include <memory> 10 #include <memory>
(...skipping 78 matching lines...) Expand 10 before | Expand all | Expand 10 after
89 ui::ScopedCrTrackingArea trackingArea_; 89 ui::ScopedCrTrackingArea trackingArea_;
90 90
91 // We retain/release the hover button since interaction with the 91 // We retain/release the hover button since interaction with the
92 // button may make it go away (e.g. delete menu option over a 92 // button may make it go away (e.g. delete menu option over a
93 // bookmark button). Thus this variable is not weak. The 93 // bookmark button). Thus this variable is not weak. The
94 // hoveredButton_ is required to have an NSCell that responds to 94 // hoveredButton_ is required to have an NSCell that responds to
95 // setMouseInside:animate:. 95 // setMouseInside:animate:.
96 NSButton* hoveredButton_; 96 NSButton* hoveredButton_;
97 } 97 }
98 98
99 // Return the inset needed to center a toolbar button's icon within the 28x28
100 // design area defined by Material Design.
101 + (CGFloat)materialDesignButtonInset;
102
99 // Initialize the toolbar and register for command updates. The profile is 103 // Initialize the toolbar and register for command updates. The profile is
100 // needed for initializing the location bar. The browser is needed for 104 // needed for initializing the location bar. The browser is needed for
101 // the toolbar model and back/forward menus. The resizeDelegate is used 105 // the toolbar model and back/forward menus. The resizeDelegate is used
102 // to smoothly animate height changes for the toolbar. 106 // to smoothly animate height changes for the toolbar.
103 - (id)initWithCommands:(CommandUpdater*)commands 107 - (id)initWithCommands:(CommandUpdater*)commands
104 profile:(Profile*)profile 108 profile:(Profile*)profile
105 browser:(Browser*)browser 109 browser:(Browser*)browser
106 resizeDelegate:(id<ViewResizer>)resizeDelegate; 110 resizeDelegate:(id<ViewResizer>)resizeDelegate;
107 111
108 // Get the C++ bridge object representing the location bar for this tab. 112 // Get the C++ bridge object representing the location bar for this tab.
(...skipping 83 matching lines...) Expand 10 before | Expand all | Expand 10 after
192 @interface ToolbarController(PrivateTestMethods) 196 @interface ToolbarController(PrivateTestMethods)
193 // Returns an array of views in the order of the outlets above. 197 // Returns an array of views in the order of the outlets above.
194 - (NSArray*)toolbarViews; 198 - (NSArray*)toolbarViews;
195 - (void)showOptionalHomeButton; 199 - (void)showOptionalHomeButton;
196 - (void)installAppMenu; 200 - (void)installAppMenu;
197 // Return a hover button for the current event. 201 // Return a hover button for the current event.
198 - (NSButton*)hoverButtonForEvent:(NSEvent*)theEvent; 202 - (NSButton*)hoverButtonForEvent:(NSEvent*)theEvent;
199 @end 203 @end
200 204
201 #endif // CHROME_BROWSER_UI_COCOA_TOOLBAR_TOOLBAR_CONTROLLER_H_ 205 #endif // CHROME_BROWSER_UI_COCOA_TOOLBAR_TOOLBAR_CONTROLLER_H_
OLDNEW
« no previous file with comments | « chrome/browser/ui/cocoa/menu_button.mm ('k') | chrome/browser/ui/cocoa/toolbar/toolbar_controller.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698