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

Unified Diff: chrome/browser/ui/cocoa/toolbar/toolbar_controller.h

Issue 1305143008: [Mac] Implement LocationBarViewMac::UpdateLocationBarVisibility() (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Addressing nits Created 5 years, 2 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: 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..ca51e476e674596273e8aadadb088682eaf065cd 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,9 @@ class NotificationBridge;
// Create and add the Browser Action buttons to the toolbar view.
- (void)createBrowserActionButtons;
+// Updates the visibility of the toolbar, with an optional animation.
+- (void)updateVisibility:(BOOL)visible withAnimation:(BOOL)animate;
+
// Return the BrowserActionsController for this toolbar.
- (BrowserActionsController*)browserActionsController;
@@ -178,17 +179,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.
« no previous file with comments | « chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.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