Adjust positioning of bookmarks bubble 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"
@@ skipping 281 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();
+
   views::View* star_view = location_bar()->star_view();
   return (star_view && star_view->visible()) ? star_view : app_menu_button_;
 }
 
 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_;
@@ skipping 485 matching lines @@
   SchedulePaint();
 }
 
 int ToolbarView::content_shadow_height() const {
 #if defined(USE_ASH)
   return GetLayoutConstant(TOOLBAR_CONTENT_SHADOW_HEIGHT_ASH);
 #else
   return GetLayoutConstant(TOOLBAR_CONTENT_SHADOW_HEIGHT);
 #endif
 }