| Index: chrome/browser/ui/cocoa/toolbar/toolbar_controller.mm
|
| diff --git a/chrome/browser/ui/cocoa/toolbar/toolbar_controller.mm b/chrome/browser/ui/cocoa/toolbar/toolbar_controller.mm
|
| index 9775c36fd731d66ff45efb264b1ce841c52e4378..fb542a90c9b73968107748b7468ba65e5b5aa7b0 100644
|
| --- a/chrome/browser/ui/cocoa/toolbar/toolbar_controller.mm
|
| +++ b/chrome/browser/ui/cocoa/toolbar/toolbar_controller.mm
|
| @@ -36,7 +36,9 @@
|
| #import "chrome/browser/ui/cocoa/gradient_button_cell.h"
|
| #import "chrome/browser/ui/cocoa/image_button_cell.h"
|
| #import "chrome/browser/ui/cocoa/location_bar/autocomplete_text_field_editor.h"
|
| +#import "chrome/browser/ui/cocoa/location_bar/location_bar_decoration.h"
|
| #import "chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.h"
|
| +#import "chrome/browser/ui/cocoa/location_bar/star_decoration.h"
|
| #import "chrome/browser/ui/cocoa/menu_button.h"
|
| #import "chrome/browser/ui/cocoa/toolbar/app_toolbar_button.h"
|
| #import "chrome/browser/ui/cocoa/toolbar/app_toolbar_button_cell.h"
|
| @@ -958,7 +960,8 @@ class NotificationBridge : public AppMenuIconController::Delegate {
|
|
|
| - (NSPoint)bookmarkBubblePoint {
|
| if (locationBarView_->IsStarEnabled())
|
| - return locationBarView_->GetBookmarkBubblePoint();
|
| + return locationBarView_->GetBubblePointForDecoration(
|
| + locationBarView_->star_decoration());
|
|
|
| // Grab bottom middle of hotdogs.
|
| NSRect frame = appMenuButton_.frame;
|
| @@ -968,18 +971,10 @@ class NotificationBridge : public AppMenuIconController::Delegate {
|
| return [self.view convertPoint:point toView:nil];
|
| }
|
|
|
| -- (NSPoint)managePasswordsBubblePoint {
|
| - return locationBarView_->GetManagePasswordsBubblePoint();
|
| -}
|
| -
|
| - (NSPoint)saveCreditCardBubblePoint {
|
| return locationBarView_->GetSaveCreditCardBubblePoint();
|
| }
|
|
|
| -- (NSPoint)translateBubblePoint {
|
| - return locationBarView_->GetTranslateBubblePoint();
|
| -}
|
| -
|
| - (CGFloat)baseToolbarHeight {
|
| // Height of the toolbar in pixels when the bookmark bar is closed.
|
| const CGFloat kBaseToolbarHeightNormal = 37;
|
|
|