Fix bookmark bubble/star view highlighting for Harmony.

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

 // Copyright 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/views/frame/browser_view.h"
 
 #include <stdint.h>
 
 #include <algorithm>
 #include <memory>
@@ skipping 63 matching lines @@
 #include "chrome/browser/ui/views/frame/browser_view_layout.h"
 #include "chrome/browser/ui/views/frame/browser_view_layout_delegate.h"
 #include "chrome/browser/ui/views/frame/contents_layout_manager.h"
 #include "chrome/browser/ui/views/frame/immersive_mode_controller.h"
 #include "chrome/browser/ui/views/frame/top_container_view.h"
 #include "chrome/browser/ui/views/frame/web_contents_close_handler.h"
 #include "chrome/browser/ui/views/ime/ime_warning_bubble_view.h"
 #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"
 #include "chrome/browser/ui/views/profiles/profile_indicator_icon.h"
 #include "chrome/browser/ui/views/session_crashed_bubble_view.h"
 #include "chrome/browser/ui/views/status_bubble_views.h"
 #include "chrome/browser/ui/views/tabs/browser_tab_strip_controller.h"
 #include "chrome/browser/ui/views/tabs/tab.h"
 #include "chrome/browser/ui/views/tabs/tab_strip.h"
 #include "chrome/browser/ui/views/toolbar/app_menu_button.h"
@@ skipping 1142 matching lines @@
 }
 
 void BrowserView::ShowUpdateChromeDialog() {
   UpdateRecommendedMessageBox::Show(GetNativeWindow());
 }
 
 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(
     const WebApplicationInfo& web_app_info,
     const ShowBookmarkAppBubbleCallback& callback) {
   BookmarkAppConfirmationView::CreateAndShow(GetNativeWindow(), web_app_info,
                                              callback);
 }
 
 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;
 }
 
 void BrowserView::ShowTranslateBubble(
     content::WebContents* web_contents,
     translate::TranslateStep step,
     translate::TranslateErrors::Type error_type,
     bool is_user_gesture) {
   if (contents_web_view_->HasFocus() &&
       !GetLocationBarView()->IsMouseHovered()) {
     content::RenderViewHost* rvh = web_contents->GetRenderViewHost();
     if (rvh->IsFocusedElementEditable())
       return;
   }
 
   ChromeTranslateClient* chrome_translate_client =
       ChromeTranslateClient::FromWebContents(web_contents);
   translate::LanguageState& language_state =
       chrome_translate_client->GetLanguageState();
   language_state.SetTranslateEnabled(true);
 
   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)
 void BrowserView::ShowOneClickSigninConfirmation(
     const base::string16& email,
     const StartSyncCallback& start_sync_callback) {
   std::unique_ptr<OneClickSigninLinksDelegate> delegate(
       new OneClickSigninLinksDelegateImpl(browser()));
   OneClickSigninDialogView::ShowDialog(email, std::move(delegate),
                                        GetNativeWindow(), start_sync_callback);
@@ skipping 216 matching lines @@
 }
 
 LocationBarView* BrowserView::GetLocationBarView() const {
   return toolbar_ ? toolbar_->location_bar() : nullptr;
 }
 
 views::View* BrowserView::GetTabContentsContainerView() const {
   return contents_web_view_;
 }
 
-ToolbarView* BrowserView::GetToolbarView() const {
-  return toolbar_;
-}
-
 ///////////////////////////////////////////////////////////////////////////////
 // BrowserView, TabStripModelObserver implementation:
 
 void BrowserView::TabInsertedAt(TabStripModel* tab_strip_model,
                                 WebContents* contents,
                                 int index,
                                 bool foreground) {
 #if defined(USE_AURA)
   // WebContents inserted in tabs might not have been added to the root
   // window yet. Per http://crbug/342672 add them now since drawing the
@@ skipping 1112 matching lines @@
 }
 
 extensions::ActiveTabPermissionGranter*
 BrowserView::GetActiveTabPermissionGranter() {
   content::WebContents* web_contents = GetActiveWebContents();
   if (!web_contents)
     return nullptr;
   return extensions::TabHelper::FromWebContents(web_contents)
       ->active_tab_permission_granter();
 }