Move ShowPopup logic from BrowserActionsContainer to BrowserActionView

chrome/browser/ui/views/extensions/browser_action_overflow_menu_controller.cc

 // Copyright (c) 2012 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/browser_action_overflow_menu_controller.h"
 
 #include "base/message_loop/message_loop.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/extensions/extension_action.h"
 #include "chrome/browser/extensions/extension_action_manager.h"
@@ skipping 119 matching lines @@
   icon_updaters_.clear();
 }
 
 bool BrowserActionOverflowMenuController::IsCommandEnabled(int id) const {
   BrowserActionView* view = (*views_)[start_index_ + id - 1];
   return view->button()->IsEnabled(owner_->GetCurrentTabId());
 }
 
 void BrowserActionOverflowMenuController::ExecuteCommand(int id) {
   BrowserActionView* view = (*views_)[start_index_ + id - 1];
-  owner_->OnBrowserActionExecuted(view->button());
+  view->button()->ExecuteBrowserAction();
 }
 
 bool BrowserActionOverflowMenuController::ShowContextMenu(
     views::MenuItemView* source,
     int id,
     const gfx::Point& p,
     ui::MenuSourceType source_type) {
-  const extensions::Extension* extension =
-      (*views_)[start_index_ + id - 1]->button()->extension();
-  if (!extension->ShowConfigureContextMenus())
+  BrowserActionButton* button = (*views_)[start_index_ + id - 1]->button();
+  if (!button->extension()->ShowConfigureContextMenus())
     return false;
 
   scoped_refptr<ExtensionContextMenuModel> context_menu_contents =
-      new ExtensionContextMenuModel(extension, browser_, owner_);
+      new ExtensionContextMenuModel(button->extension(), browser_, button);
   views::MenuRunner context_menu_runner(context_menu_contents.get(),
                                         views::MenuRunner::HAS_MNEMONICS |
                                             views::MenuRunner::IS_NESTED |
                                             views::MenuRunner::CONTEXT_MENU);
 
   // We can ignore the result as we delete ourself.
   // This blocks until the user choses something or dismisses the menu.
   ignore_result(context_menu_runner.RunMenuAt(menu_button_->GetWidget(),
                                               NULL,
                                               gfx::Rect(p, gfx::Size()),
@@ skipping 94 matching lines @@
 
 BrowserActionView* BrowserActionOverflowMenuController::ViewForId(
     int id, size_t* index) {
   // The index of the view being dragged (GetCommand gives a 1-based index into
   // the overflow menu).
   size_t view_index = owner_->VisibleBrowserActions() + id - 1;
   if (index)
     *index = view_index;
   return owner_->GetBrowserActionViewAt(view_index);
 }