[Mac] Omnibox icons active states

chrome/browser/ui/cocoa/toolbar/toolbar_controller.mm

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..8dd0b2fdf48acc38377c13cd8e972cdea79d2800 100644
--- a/chrome/browser/ui/cocoa/toolbar/toolbar_controller.mm
+++ b/chrome/browser/ui/cocoa/toolbar/toolbar_controller.mm
@@ -36,7 +36,10 @@
 #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/location_bar/translate_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 +961,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,16 +972,23 @@ 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();
+- (NSPoint)bubblePointForDecoration:(LocationBarDecoration*)decoration {
+  // |-bookmarkBubblePoint| should be used for the bookmark decoration.
+  DCHECK(decoration != locationBarView_->star_decoration());
+
+  return locationBarView_->GetBubblePointForDecoration(decoration);
+}
+
+- (LocationBarDecoration*)bookmarkDecoration {
+  return locationBarView_->star_decoration();
+}
+
+- (LocationBarDecoration*)translateDecoration {
+  return locationBarView_->translate_decoration();
 }
 
 - (CGFloat)baseToolbarHeight {