Fix bookmark bubble/star view highlighting for Harmony.

chrome/browser/ui/views/extensions/extension_installed_bubble_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 <algorithm>
 #include <string>
 
 #include "base/macros.h"
 #include "base/memory/ptr_util.h"
 #include "base/metrics/user_metrics_action.h"
@@ skipping 105 matching lines @@
 
 ExtensionInstalledBubbleView::~ExtensionInstalledBubbleView() {}
 
 void ExtensionInstalledBubbleView::UpdateAnchorView() {
   BrowserView* browser_view = BrowserView::GetBrowserViewForBrowser(browser());
 
   views::View* reference_view = nullptr;
   switch (controller_->anchor_position()) {
     case ExtensionInstalledBubble::ANCHOR_BROWSER_ACTION: {
       BrowserActionsContainer* container =
-          browser_view->GetToolbarView()->browser_actions();
+          browser_view->toolbar()->browser_actions();
       // Hitting this DCHECK means |ShouldShow| failed.
       DCHECK(!container->animating());
 
       reference_view = container->GetViewForId(controller_->extension()->id());
       break;
     }
     case ExtensionInstalledBubble::ANCHOR_PAGE_ACTION: {
       LocationBarView* location_bar_view = browser_view->GetLocationBarView();
       ExtensionAction* page_action =
           extensions::ExtensionActionManager::Get(browser()->profile())
               ->GetPageAction(*controller_->extension());
       location_bar_view->SetPreviewEnabledPageAction(page_action,
                                                      true);  // preview_enabled
       reference_view = location_bar_view->GetPageActionView(page_action);
       DCHECK(reference_view);
       break;
     }
     case ExtensionInstalledBubble::ANCHOR_OMNIBOX: {
       reference_view = browser_view->GetLocationBarView()->location_icon_view();
       break;
     }
     case ExtensionInstalledBubble::ANCHOR_APP_MENU:
       // Will be caught below.
       break;
   }
 
   // Default case.
   if (!reference_view || !reference_view->visible())
-    reference_view = browser_view->GetToolbarView()->app_menu_button();
+    reference_view = browser_view->toolbar()->app_menu_button();
   SetAnchorView(reference_view);
 }
 
 void ExtensionInstalledBubbleView::CloseBubble() {
   if (controller_ && controller_->anchor_position() ==
       ExtensionInstalledBubble::ANCHOR_PAGE_ACTION) {
     BrowserView* browser_view =
         BrowserView::GetBrowserViewForBrowser(browser());
     browser_view->GetLocationBarView()->SetPreviewEnabledPageAction(
         extensions::ExtensionActionManager::Get(browser()->profile())
@@ skipping 176 matching lines @@
   bubble_view_ = nullptr;
 }
 
 }  // namespace
 
 // Views specific implementation.
 bool ExtensionInstalledBubble::ShouldShow() {
   if (anchor_position() == ANCHOR_BROWSER_ACTION) {
     BrowserActionsContainer* container =
         BrowserView::GetBrowserViewForBrowser(browser())
-            ->GetToolbarView()
+            ->toolbar()
             ->browser_actions();
     return !container->animating();
   }
   return true;
 }
 
 // Implemented here to create the platform specific instance of the BubbleUi.
 std::unique_ptr<BubbleUi> ExtensionInstalledBubble::BuildBubbleUi() {
   return base::WrapUnique(new ExtensionInstalledBubbleUi(this));
 }