Fix bookmark bubble/star view highlighting for Harmony.

chrome/browser/ui/views/frame/browser_view.cc

Index: chrome/browser/ui/views/frame/browser_view.cc
diff --git a/chrome/browser/ui/views/frame/browser_view.cc b/chrome/browser/ui/views/frame/browser_view.cc
index bc89bc5d0cef132ad285f7ad32d70de39d04b437..5d398aa9fa617e23ef68ef834f9b5a59bc603fde 100644
--- a/chrome/browser/ui/views/frame/browser_view.cc
+++ b/chrome/browser/ui/views/frame/browser_view.cc
@@ -81,6 +81,7 @@
 #include "chrome/browser/ui/views/infobars/infobar_container_view.h"
 #include "chrome/browser/ui/views/location_bar/location_bar_view.h"
 #include "chrome/browser/ui/views/location_bar/location_icon_view.h"
+#include "chrome/browser/ui/views/location_bar/star_view.h"
 #include "chrome/browser/ui/views/location_bar/zoom_bubble_view.h"
 #include "chrome/browser/ui/views/new_back_shortcut_bubble.h"
 #include "chrome/browser/ui/views/omnibox/omnibox_view_views.h"
@@ -1243,11 +1244,11 @@ void BrowserView::ShowBookmarkBubble(const GURL& url, bool already_bookmarked) {
   std::unique_ptr<BubbleSyncPromoDelegate> delegate;
   delegate.reset(new BookmarkBubbleSignInDelegate(browser_.get()));
 
-  views::View* anchor_view = GetToolbarView()->GetBookmarkBubbleAnchor();
+  views::View* anchor_view = toolbar_->GetBookmarkBubbleAnchor();

[sky, 2016/09/29 03:17:40]

I find this change confusing because it's assuming a particular implementation
in Toolbarview. That is, it's assuming star view is the one that wants to be the
animation observer and that anchor_view may be something else. How about
forwarding the ShowBookmarkBubble call to ToolbarView as it's really the one
that knows how everything is wired. I think that would mean Toolbarview doesn't
need to expose GetBookmarkBubbleAnchor(), which seems like a good thing too.

[Evan Stade, 2016/09/29 17:20:01]

sure, sounds reasonable. done.

   views::Widget* bubble_widget = BookmarkBubbleView::ShowBubble(
       anchor_view, gfx::Rect(), nullptr, bookmark_bar_view_.get(),
       std::move(delegate), browser_->profile(), url, already_bookmarked);
-  GetToolbarView()->OnBubbleCreatedForAnchor(anchor_view, bubble_widget);
+  bubble_widget->AddObserver(toolbar_->location_bar()->star_view());
 }
 
 void BrowserView::ShowBookmarkAppBubble(
@@ -1261,10 +1262,10 @@ autofill::SaveCardBubbleView* BrowserView::ShowSaveCreditCardBubble(
     content::WebContents* web_contents,
     autofill::SaveCardBubbleController* controller,
     bool is_user_gesture) {
-  views::View* anchor_view = GetToolbarView()->GetSaveCreditCardBubbleAnchor();
+  views::View* anchor_view = toolbar_->GetSaveCreditCardBubbleAnchor();
   autofill::SaveCardBubbleViews* view = new autofill::SaveCardBubbleViews(
       anchor_view, web_contents, controller);
-  GetToolbarView()->OnBubbleCreatedForAnchor(anchor_view, view->GetWidget());
+  toolbar_->OnBubbleCreatedForAnchor(anchor_view, view->GetWidget());
   view->Show(is_user_gesture ? autofill::SaveCardBubbleViews::USER_GESTURE
                              : autofill::SaveCardBubbleViews::AUTOMATIC);
   return view;
@@ -1291,12 +1292,12 @@ void BrowserView::ShowTranslateBubble(
   if (IsMinimized())
     return;
 
-  views::View* anchor_view = GetToolbarView()->GetTranslateBubbleAnchor();
+  views::View* anchor_view = toolbar_->GetTranslateBubbleAnchor();
   views::Widget* bubble_widget = TranslateBubbleView::ShowBubble(
       anchor_view, web_contents, step,
       error_type, is_user_gesture ? TranslateBubbleView::USER_GESTURE
                                   : TranslateBubbleView::AUTOMATIC);
-  GetToolbarView()->OnBubbleCreatedForAnchor(anchor_view, bubble_widget);
+  toolbar_->OnBubbleCreatedForAnchor(anchor_view, bubble_widget);
 }
 
 #if BUILDFLAG(ENABLE_ONE_CLICK_SIGNIN)
@@ -1533,10 +1534,6 @@ views::View* BrowserView::GetTabContentsContainerView() const {
   return contents_web_view_;
 }
 
-ToolbarView* BrowserView::GetToolbarView() const {
-  return toolbar_;
-}
-
 ///////////////////////////////////////////////////////////////////////////////
 // BrowserView, TabStripModelObserver implementation: