Fix bookmark bubble/star view highlighting for Harmony.

chrome/browser/ui/views/toolbar/toolbar_view.cc

 // Copyright 2013 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/toolbar/toolbar_view.h"
 
 #include <algorithm>
 
 #include "base/command_line.h"
 #include "base/i18n/number_formatting.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/trace_event/trace_event.h"
 #include "build/build_config.h"
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/command_updater.h"
 #include "chrome/browser/extensions/extension_util.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/themes/theme_properties.h"
+#include "chrome/browser/ui/bookmarks/bookmark_bubble_sign_in_delegate.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_command_controller.h"
 #include "chrome/browser/ui/browser_commands.h"
 #include "chrome/browser/ui/browser_content_setting_bubble_model_delegate.h"
 #include "chrome/browser/ui/browser_tabstrip.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/global_error/global_error_service.h"
 #include "chrome/browser/ui/global_error/global_error_service_factory.h"
 #include "chrome/browser/ui/layout_constants.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/browser/ui/view_ids.h"
 #include "chrome/browser/ui/views/autofill/save_card_icon_view.h"
+#include "chrome/browser/ui/views/bookmarks/bookmark_bubble_view.h"
 #include "chrome/browser/ui/views/extensions/extension_popup.h"
 #include "chrome/browser/ui/views/frame/browser_view.h"
 #include "chrome/browser/ui/views/location_bar/page_action_image_view.h"
 #include "chrome/browser/ui/views/location_bar/page_action_with_badge_view.h"
 #include "chrome/browser/ui/views/location_bar/star_view.h"
 #include "chrome/browser/ui/views/outdated_upgrade_bubble_view.h"
 #include "chrome/browser/ui/views/toolbar/app_menu_button.h"
 #include "chrome/browser/ui/views/toolbar/back_button.h"
 #include "chrome/browser/ui/views/toolbar/browser_actions_container.h"
 #include "chrome/browser/ui/views/toolbar/home_button.h"
@@ skipping 236 matching lines @@
 
 void ToolbarView::SetPaneFocusAndFocusAppMenu() {
   if (app_menu_button_)
     SetPaneFocus(app_menu_button_);
 }
 
 bool ToolbarView::IsAppMenuFocused() {
   return app_menu_button_ && app_menu_button_->HasFocus();
 }
 
-views::View* ToolbarView::GetBookmarkBubbleAnchor() {
-  if (ui::MaterialDesignController::IsSecondaryUiMaterial())
-    return location_bar();
+void ToolbarView::ShowBookmarkBubble(
+    const GURL& url,
+    bool already_bookmarked,
+    bookmarks::BookmarkBubbleObserver* observer) {
+  views::View* anchor_view = location_bar();
+  StarView* star_view = location_bar()->star_view();
+  if (!ui::MaterialDesignController::IsSecondaryUiMaterial()) {
+    if (star_view && star_view->visible())
+      anchor_view = star_view;
+    else
+      anchor_view = app_menu_button_;
+  }
 
-  views::View* star_view = location_bar()->star_view();
-  return (star_view && star_view->visible()) ? star_view : app_menu_button_;
+  std::unique_ptr<BubbleSyncPromoDelegate> delegate;
+  delegate.reset(new BookmarkBubbleSignInDelegate(browser_));
+  views::Widget* bubble_widget = BookmarkBubbleView::ShowBubble(
+      anchor_view, gfx::Rect(), nullptr, observer, std::move(delegate),
+      browser_->profile(), url, already_bookmarked);
+  if (star_view)
+    bubble_widget->AddObserver(star_view);
 }
 
 views::View* ToolbarView::GetSaveCreditCardBubbleAnchor() {
   views::View* save_credit_card_icon_view =
       location_bar()->save_credit_card_icon_view();
   return (save_credit_card_icon_view && save_credit_card_icon_view->visible())
              ? save_credit_card_icon_view
              : app_menu_button_;
 }
 
 views::View* ToolbarView::GetTranslateBubbleAnchor() {
   views::View* translate_icon_view = location_bar()->translate_icon_view();
   return (translate_icon_view && translate_icon_view->visible())
              ? translate_icon_view
              : app_menu_button_;
 }
 
 void ToolbarView::OnBubbleCreatedForAnchor(views::View* anchor_view,
                                            views::Widget* bubble_widget) {
   if (bubble_widget &&
-      (anchor_view == location_bar()->star_view() ||
-       anchor_view == location_bar()->save_credit_card_icon_view() ||
+      (anchor_view == location_bar()->save_credit_card_icon_view() ||
        anchor_view == location_bar()->translate_icon_view())) {
     DCHECK(anchor_view);
     bubble_widget->AddObserver(static_cast<BubbleIconView*>(anchor_view));
   }
 }
 
 int ToolbarView::GetMaxBrowserActionsWidth() const {
   // The browser actions container is allowed to grow, but only up until the
   // omnibox reaches its minimum size. So its maximum allowed width is its
   // current size, plus any that the omnibox could give up.
@@ skipping 416 matching lines @@
   if (OutdatedUpgradeBubbleView::IsAvailable()) {
     OutdatedUpgradeBubbleView::ShowBubble(app_menu_button_, browser_,
                                           auto_update_enabled);
   }
 }
 
 void ToolbarView::OnShowHomeButtonChanged() {
   Layout();
   SchedulePaint();
 }