| Index: chrome/browser/ui/views/extensions/browser_action_overflow_menu_controller.cc
|
| diff --git a/chrome/browser/ui/views/extensions/browser_action_overflow_menu_controller.cc b/chrome/browser/ui/views/extensions/browser_action_overflow_menu_controller.cc
|
| index daa5732a0305fb3d9c6fb2cba072f8b6e69d76ab..98c0115e1cd9c260df7d123a6fbeb8a814420419 100644
|
| --- a/chrome/browser/ui/views/extensions/browser_action_overflow_menu_controller.cc
|
| +++ b/chrome/browser/ui/views/extensions/browser_action_overflow_menu_controller.cc
|
| @@ -137,7 +137,7 @@ bool BrowserActionOverflowMenuController::IsCommandEnabled(int id) const {
|
|
|
| void BrowserActionOverflowMenuController::ExecuteCommand(int id) {
|
| BrowserActionView* view = (*views_)[start_index_ + id - 1];
|
| - owner_->OnBrowserActionExecuted(view->button());
|
| + view->button()->ExecuteBrowserAction();
|
| }
|
|
|
| bool BrowserActionOverflowMenuController::ShowContextMenu(
|
| @@ -145,13 +145,12 @@ bool BrowserActionOverflowMenuController::ShowContextMenu(
|
| 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 |
|
|
|