Convert BrowserActionOverflowMenu context menu from Menu2 to MenuItemView.

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

 // Copyright (c) 2011 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/utf_string_conversions.h"
 #include "chrome/browser/extensions/extension_context_menu_model.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/browser/ui/views/browser_actions_container.h"
 #include "chrome/browser/ui/views/extensions/browser_action_drag_data.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/extensions/extension_action.h"
 #include "ui/gfx/canvas_skia.h"
-#include "views/controls/menu/menu_2.h"
 #include "views/controls/menu/menu_item_view.h"
+#include "views/controls/menu/menu_model_adapter.h"
+#include "views/controls/menu/submenu_view.h"
+#include "views/window/window.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 61 matching lines @@
 bool BrowserActionOverflowMenuController::ShowContextMenu(
     views::MenuItemView* source,
     int id,
     const gfx::Point& p,
     bool is_mouse_gesture) {
   const Extension* extension =
       (*views_)[start_index_ + id - 1]->button()->extension();
   if (!extension->ShowConfigureContextMenus())
     return false;
 
-  context_menu_contents_ = new ExtensionContextMenuModel(
-      extension,
-      owner_->browser(),
-      owner_);
-  context_menu_menu_.reset(new views::Menu2(context_menu_contents_.get()));
+  scoped_refptr<ExtensionContextMenuModel> context_menu_contents =
+      new ExtensionContextMenuModel(extension, owner_->browser(), owner_);
+  views::MenuModelAdapter context_menu_model_adapter(
+      context_menu_contents.get());
+  views::MenuItemView context_menu_menu(&context_menu_model_adapter);

[Peter Kasting, 2011/06/09 17:44:51]

Nit: Can this just be |context_menu|?  Or |context_menu_view| if not?

[rhashimoto, 2011/06/09 19:00:02]

Done.

+  context_menu_model_adapter.BuildMenu(&context_menu_menu);
+
   // This blocks until the user choses something or dismisses the menu.
-  context_menu_menu_->RunContextMenuAt(p);
+  context_menu_menu.RunMenuAt(menu_button_->GetWidget()->GetNativeWindow(),
+      NULL, gfx::Rect(p, gfx::Size()), views::MenuItemView::TOPLEFT, true);
 
   // 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);
 }