Chromium Code Reviews| Index: chrome/browser/ui/cocoa/toolbar/toolbar_controller.h |
| diff --git a/chrome/browser/ui/cocoa/toolbar/toolbar_controller.h b/chrome/browser/ui/cocoa/toolbar/toolbar_controller.h |
| index 1740e00d5c97f683a7d63ec7c4b1b2a923aa059e..05bb76ed7e704f8533ce75f09aefec2548bd6c5f 100644 |
| --- a/chrome/browser/ui/cocoa/toolbar/toolbar_controller.h |
| +++ b/chrome/browser/ui/cocoa/toolbar/toolbar_controller.h |
| @@ -82,10 +82,6 @@ class NotificationBridge; |
| BOOL hasLocationBar_; // If |hasToolbar_| is YES, this must also be YES. |
| BOOL locationBarAtMinSize_; // If the location bar is at the minimum size. |
| - // We have an extra retain in the locationBar_. |
| - // See comments in awakeFromNib for more info. |
| - base::scoped_nsobject<AutocompleteTextField> locationBarRetainer_; |
| - |
| // Tracking area for mouse enter/exit/moved in the toolbar. |
| ui::ScopedCrTrackingArea trackingArea_; |
| @@ -99,10 +95,12 @@ class NotificationBridge; |
| // Initialize the toolbar and register for command updates. The profile is |
| // needed for initializing the location bar. The browser is needed for |
| -// the toolbar model and back/forward menus. |
| +// the toolbar model and back/forward menus. The resizeDelegate is used |
| +// to smoothly animate height changes for the toolbar. |
| - (id)initWithCommands:(CommandUpdater*)commands |
| profile:(Profile*)profile |
| - browser:(Browser*)browser; |
| + browser:(Browser*)browser |
| + resizeDelegate:(id<ViewResizer>)resizeDelegate; |
| // Get the C++ bridge object representing the location bar for this tab. |
| - (LocationBarViewMac*)locationBarBridge; |
| @@ -167,6 +165,10 @@ class NotificationBridge; |
| // Create and add the Browser Action buttons to the toolbar view. |
| - (void)createBrowserActionButtons; |
| +// Updates the visibility of the toolbar if the requested visibility differs |
|
tapted
2015/10/26 23:48:08
nit: remove "if the requested visibility differs f
dominickn
2015/10/27 00:15:17
Done.
|
| +// from the current visibility, with an optional animation. |
| +- (void)updateVisibility:(BOOL)visible withAnimation:(BOOL)animate; |
| + |
| // Return the BrowserActionsController for this toolbar. |
| - (BrowserActionsController*)browserActionsController; |
| @@ -178,17 +180,6 @@ class NotificationBridge; |
| @end |
| -// A set of private methods used by subclasses. Do not call these directly |
| -// unless a subclass of ToolbarController. |
| -@interface ToolbarController(ProtectedMethods) |
| -// Designated initializer which takes a nib name in order to allow subclasses |
| -// to load a different nib file. |
| -- (id)initWithCommands:(CommandUpdater*)commands |
| - profile:(Profile*)profile |
| - browser:(Browser*)browser |
| - nibFileNamed:(NSString*)nibName; |
| -@end |
| - |
| // A set of private methods used by tests, in the absence of "friends" in ObjC. |
| @interface ToolbarController(PrivateTestMethods) |
| // Returns an array of views in the order of the outlets above. |