Cleanup BrowserActionsContainer a bit

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 "chrome/browser/ui/views/extensions/extension_installed_bubble_view.h"
 
 #include <algorithm>
 #include <string>
 
 #include "base/i18n/rtl.h"
@@ skipping 509 matching lines @@
 ExtensionInstalledBubbleView::ExtensionInstalledBubbleView(
     const Extension* extension, Browser *browser, const SkBitmap& icon)
     : bubble_(this, extension, browser, icon) {
 }
 
 ExtensionInstalledBubbleView::~ExtensionInstalledBubbleView() {}
 
 bool ExtensionInstalledBubbleView::MaybeShowNow() {
   BrowserView* browser_view =
       BrowserView::GetBrowserViewForBrowser(bubble_.browser());
-  extensions::ExtensionActionManager* extension_action_manager =
-      extensions::ExtensionActionManager::Get(bubble_.browser()->profile());
 
   views::View* reference_view = NULL;
   if (bubble_.type() == bubble_.BROWSER_ACTION) {
     BrowserActionsContainer* container =
         browser_view->GetToolbarView()->browser_actions();
     if (container->animating())
       return false;
 
-    reference_view = container->GetBrowserActionView(
-        extension_action_manager->GetBrowserAction(*bubble_.extension()));
+    reference_view = container->GetViewForExtension(bubble_.extension());
     // If the view is not visible then it is in the chevron, so point the
     // install bubble to the chevron instead. If this is an incognito window,
     // both could be invisible.
     if (!reference_view || !reference_view->visible()) {
       reference_view = container->chevron();
       if (!reference_view || !reference_view->visible())
         reference_view = NULL;  // fall back to app menu below.
     }
   } else if (bubble_.type() == bubble_.PAGE_ACTION) {
     LocationBarView* location_bar_view = browser_view->GetLocationBarView();
     ExtensionAction* page_action =
-        extension_action_manager->GetPageAction(*bubble_.extension());
+        extensions::ExtensionActionManager::Get(bubble_.browser()->profile())->
+            GetPageAction(*bubble_.extension());
     location_bar_view->SetPreviewEnabledPageAction(page_action,
                                                    true);  // preview_enabled
     reference_view = location_bar_view->GetPageActionView(page_action);
     DCHECK(reference_view);
   } else if (bubble_.type() == bubble_.OMNIBOX_KEYWORD) {
     LocationBarView* location_bar_view = browser_view->GetLocationBarView();
     reference_view = location_bar_view;
     DCHECK(reference_view);
   }
 
@@ skipping 35 matching lines @@
 void ExtensionInstalledBubbleView::WindowClosing() {
   if (bubble_.extension() && bubble_.type() == bubble_.PAGE_ACTION) {
     BrowserView* browser_view =
         BrowserView::GetBrowserViewForBrowser(bubble_.browser());
     browser_view->GetLocationBarView()->SetPreviewEnabledPageAction(
         extensions::ExtensionActionManager::Get(bubble_.browser()->profile())->
         GetPageAction(*bubble_.extension()),
         false);  // preview_enabled
   }
 }