Extension context menu refactor

chrome/browser/views/extensions/extension_installed_bubble.cc

 // Copyright (c) 2010 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/views/extensions/extension_installed_bubble.h"
 
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
 #include "base/message_loop.h"
 #include "chrome/browser/browser.h"
@@ skipping 231 matching lines @@
         browser_view->GetToolbarView()->browser_actions();
     if (container->animating() &&
         animation_wait_retries_++ < kAnimationWaitMaxRetry) {
       // We don't know where the view will be until the container has stopped
       // animating, so check back in a little while.
       MessageLoopForUI::current()->PostDelayedTask(
           FROM_HERE, NewRunnableMethod(this,
           &ExtensionInstalledBubble::ShowInternal), kAnimationWaitTime);
       return;
     }
-    reference_view = container->GetBrowserActionView(extension_);
+    reference_view = container->GetBrowserActionView(
+        extension_->browser_action());
     // 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->IsVisible()) {
       reference_view = container->chevron();
       if (!reference_view || !reference_view->IsVisible())
         reference_view = NULL;  // fall back to app menu below.
     }
   } else if (type_ == PAGE_ACTION) {
     LocationBarView* location_bar_view = browser_view->GetLocationBarView();
@@ skipping 24 matching lines @@
                                                  bool closed_by_escape) {
   if (extension_->page_action()) {
     BrowserView* browser_view = BrowserView::GetBrowserViewForNativeWindow(
         browser_->window()->GetNativeHandle());
     browser_view->GetLocationBarView()->SetPreviewEnabledPageAction(
         extension_->page_action(),
         false);  // preview_enabled
   }
   Release();  // Balanced in ctor.
 }