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..02b58567fa98410e4bb0bbd05278a39d230aa439 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_; |
| @@ -102,7 +98,8 @@ class NotificationBridge; |
| // the toolbar model and back/forward menus. |
|
tapted
2015/10/16 00:06:16
nit: update comment here
dominickn
2015/10/20 04:40:21
Done.
|
| - (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 +164,14 @@ 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 |
| +// from the current visibility, with an optional animation. |
| +- (void)updateVisibility:(BOOL)visible withAnimation:(BOOL)animate; |
| + |
| +// Hide the back, forward, reload, home, and wrench buttons of the toolbar, |
| +// so that the location bar occupies the entire width. |
| +- (void)shouldHideToolbarButtons:(BOOL)hide; |
| + |
| // Return the BrowserActionsController for this toolbar. |
| - (BrowserActionsController*)browserActionsController; |
| @@ -186,6 +191,7 @@ class NotificationBridge; |
| - (id)initWithCommands:(CommandUpdater*)commands |
| profile:(Profile*)profile |
| browser:(Browser*)browser |
| + resizeDelegate:(id<ViewResizer>)resizeDelegate |
| nibFileNamed:(NSString*)nibName; |
| @end |