Extension context menu refactor

chrome/browser/views/extensions/browser_action_overflow_menu_controller.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/browser_action_overflow_menu_controller.h"
 
 #include "app/gfx/canvas.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/browser_list.h"
+#include "chrome/browser/extensions/extension_context_menu_model.h"
 #include "chrome/browser/profile.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/browser/views/browser_actions_container.h"
 #include "chrome/browser/views/extensions/browser_action_drag_data.h"
 #include "chrome/common/extensions/extension.h"
 #include "views/controls/menu/menu_item_view.h"
+#include "views/controls/menu/menu_2.h"
 
 BrowserActionOverflowMenuController::BrowserActionOverflowMenuController(
     BrowserActionsContainer* owner,
     views::MenuButton* menu_button,
     const std::vector<BrowserActionView*>& views,
     int start_index)
     : owner_(owner),
       observer_(NULL),
       menu_button_(menu_button),
       views_(&views),
@@ skipping 37 matching lines @@
   bounds.set_x(screen_loc.x());
   bounds.set_y(screen_loc.y());
 
   views::MenuItemView::AnchorPosition anchor =
       menu_button_->UILayoutIsRightToLeft() ? views::MenuItemView::TOPLEFT :
                                               views::MenuItemView::TOPRIGHT;
   if (for_drop) {
     menu_->RunMenuForDropAt(window, bounds, anchor);
   } else {
     menu_->RunMenuAt(window, menu_button_, bounds, anchor, false);
-    delete this;
+    // Give the context menu (if any) a chance to execute the user-selected
+    // command.
+    MessageLoop::current()->DeleteSoon(FROM_HERE, this);
   }
   return true;
 }
 
 void BrowserActionOverflowMenuController::CancelMenu() {
   menu_->Cancel();
 }
 
 void BrowserActionOverflowMenuController::ExecuteCommand(int id) {
   BrowserActionView* view = (*views_)[start_index_ + id - 1];
   owner_->OnBrowserActionExecuted(view->button(),
                                   false);  // inspect_with_devtools
 }
 
 bool BrowserActionOverflowMenuController::ShowContextMenu(
     views::MenuItemView* source,
     int id,
     const gfx::Point& p,
     bool is_mouse_gesture) {
+  context_menu_contents_.reset(new ExtensionContextMenuModel(
+      (*views_)[start_index_ + id - 1]->button()->extension(),
+      owner_->browser(),
+      owner_));
+  context_menu_menu_.reset(new views::Menu2(context_menu_contents_.get()));
   // This blocks until the user choses something or dismisses the menu.
-  owner_->GetContextMenu()->Run(
-      (*views_)[start_index_ + id - 1]->button()->extension(),
-      (*views_)[start_index_ + id - 1]->button()->extension()->browser_action(),
-      owner_,
-      owner_->profile()->GetPrefs(),
-      p);
+  context_menu_menu_->RunContextMenuAt(p);
 
   // The user is done with the context menu, so we can close the underlying
   // menu.
   menu_->Cancel();
 
   return true;
 }
 
 void BrowserActionOverflowMenuController::DropMenuClosed(
     views::MenuItemView* menu) {
@@ skipping 86 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);
 }