diff options
Diffstat (limited to 'chrome/browser/cocoa/toolbar_controller.h')
| -rw-r--r-- | chrome/browser/cocoa/toolbar_controller.h | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/chrome/browser/cocoa/toolbar_controller.h b/chrome/browser/cocoa/toolbar_controller.h index 0fdd8c4..1f277c1 100644 --- a/chrome/browser/cocoa/toolbar_controller.h +++ b/chrome/browser/cocoa/toolbar_controller.h @@ -22,7 +22,6 @@ class AppMenuModel; @class BackForwardMenuController; class Browser; @class BrowserActionsController; -class BubblePositioner; class CommandUpdater; @class DelayedMenuButton; class LocationBar; @@ -70,8 +69,6 @@ class ToolbarModel; // Used for monitoring the optional toolbar button prefs. scoped_ptr<ToolbarControllerInternal::PrefObserverBridge> prefObserver_; - // Used to position the omnibox bubble. - scoped_ptr<BubblePositioner> bubblePositioner_; BooleanPrefMember showHomeButton_; BooleanPrefMember showPageOptionButtons_; BOOL hasToolbar_; // If NO, we may have only the location bar. @@ -99,7 +96,6 @@ class ToolbarModel; IBOutlet DelayedMenuButton* forwardButton_; IBOutlet NSButton* reloadButton_; IBOutlet NSButton* homeButton_; - IBOutlet NSButton* starButton_; IBOutlet NSButton* goButton_; IBOutlet MenuButton* pageButton_; IBOutlet MenuButton* wrenchButton_; @@ -147,9 +143,10 @@ class ToolbarModel; // ignored. This changes the behavior of other methods, like |-view|. - (void)setHasToolbar:(BOOL)toolbar hasLocationBar:(BOOL)locBar; -// The bookmark bubble (when you click the star) needs to know where to go. -// Somewhere near the star button seems like a good start. -- (NSRect)starButtonInWindowCoordinates; +// The bookmark bubble (when you click the star or hit Command-d) +// needs to know where to go. Somewhere near the star icon seems like +// a good start. +- (NSRect)starIconInWindowCoordinates; // Returns the desired toolbar height for the given compression factor. - (CGFloat)desiredHeightForCompression:(CGFloat)compressByHeight; @@ -171,7 +168,6 @@ class ToolbarModel; - (NSArray*)toolbarViews; - (void)showOptionalHomeButton; - (void)showOptionalPageWrenchButtons; -- (gfx::Rect)locationStackBounds; // Return a hover button for the current event. - (NSButton*)hoverButtonForEvent:(NSEvent*)theEvent; @end |