Fix bookmark bubble/star view highlighting for Harmony.

chrome/browser/ui/views/ime/ime_warning_bubble_view.cc

 // Copyright 2016 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/ime/ime_warning_bubble_view.h"
 
 #include <string>
 
 #include "base/callback_helpers.h"
 #include "chrome/browser/extensions/api/input_ime/input_ime_api_nonchromeos.h"
@@ skipping 83 matching lines @@
     const ImeWarningBubbleResponseCallback& callback)
     : extension_(extension),
       browser_view_(browser_view),
       browser_(browser_view->browser()),
       anchor_to_browser_action_(false),
       never_show_checkbox_(nullptr),
       response_callback_(callback),
       bubble_has_shown_(false),
       toolbar_actions_bar_observer_(this),
       weak_ptr_factory_(this) {
-  container_ = browser_view_->GetToolbarView()->browser_actions();
+  container_ = browser_view_->toolbar()->browser_actions();
   toolbar_actions_bar_ = container_->toolbar_actions_bar();
   BrowserList::AddObserver(this);
 
   // The lifetime of this bubble is tied to the lifetime of the browser.
   set_parent_window(
       platform_util::GetViewForWindow(browser_view_->GetNativeWindow()));
   InitAnchorView();
   InitLayout();
 
   // If the toolbar is not animating, shows the warning bubble directly.
@@ skipping 20 matching lines @@
 
   anchor_to_browser_action_ =
       extensions::ActionInfo::GetBrowserActionInfo(extension_) ||
       extensions::FeatureSwitch::extension_action_redesign()->IsEnabled();
   if (anchor_to_browser_action_) {
     // Anchors the bubble to the browser action of the extension.
     reference_view = container_->GetViewForId(extension_->id());
   }
   if (!reference_view || !reference_view->visible()) {
     // Anchors the bubble to the app menu.
-    reference_view = browser_view_->GetToolbarView()->app_menu_button();
+    reference_view = browser_view_->toolbar()->app_menu_button();
   }
   SetAnchorView(reference_view);
   set_arrow(views::BubbleBorder::TOP_RIGHT);
 }
 
 void ImeWarningBubbleView::InitLayout() {
   // The Ime warning bubble is like this:
   //
   // -----------------------------------------
   // | Warning info                          |
@@ skipping 30 matching lines @@
   layout->StartRow(0, cs_id);
   never_show_checkbox_ =
       new views::Checkbox(l10n_util::GetStringUTF16(IDS_IME_API_NEVER_SHOW));
   layout->AddView(never_show_checkbox_);
   layout->AddPaddingRow(0, views::kRelatedControlVerticalSpacing);
 }
 
 bool ImeWarningBubbleView::IsToolbarAnimating() {
   return anchor_to_browser_action_ && container_->animating();
 }