Convert PageActionImageView context menu to MenuItemView.

chrome/browser/ui/views/location_bar/page_action_image_view.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/location_bar/page_action_image_view.h"
 
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/extensions/extension_browser_event_router.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/platform_util.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/browser/ui/views/frame/browser_view.h"
 #include "chrome/browser/ui/views/location_bar/location_bar_view.h"
 #include "chrome/common/extensions/extension_action.h"
 #include "chrome/common/extensions/extension_resource.h"
 #include "ui/base/accessibility/accessible_view_state.h"
-#include "views/controls/menu/menu_2.h"
+#include "views/controls/menu/menu_item_view.h"
+#include "views/controls/menu/menu_model_adapter.h"
 
 PageActionImageView::PageActionImageView(LocationBarView* owner,
                                          Profile* profile,
                                          ExtensionAction* page_action)
     : owner_(owner),
       profile_(profile),
       page_action_(page_action),
       ALLOW_THIS_IN_INITIALIZER_LIST(tracker_(this)),
       current_tab_id_(-1),
       preview_enabled_(false),
@@ skipping 87 matching lines @@
 void PageActionImageView::OnMouseReleased(const views::MouseEvent& event) {
   if (!HitTest(event.location()))
     return;
 
   int button = -1;
   if (event.IsLeftMouseButton()) {
     button = 1;
   } else if (event.IsMiddleMouseButton()) {
     button = 2;
   } else if (event.IsRightMouseButton()) {
-    // Get the top left point of this button in screen coordinates.
-    gfx::Point menu_origin;
-    ConvertPointToScreen(this, &menu_origin);
-    // Make the menu appear below the button.
-    menu_origin.Offset(0, height());
-    ShowContextMenu(menu_origin, true);
+    ShowContextMenu(gfx::Point(), true);
     return;
   }
 
   ExecuteAction(button, false);  // inspect_with_devtools
 }
 
 bool PageActionImageView::OnKeyPressed(const views::KeyEvent& event) {
   if (event.key_code() == ui::VKEY_SPACE ||
       event.key_code() == ui::VKEY_RETURN) {
     ExecuteAction(1, false);
     return true;
   }
   return false;
 }
 
 void PageActionImageView::ShowContextMenu(const gfx::Point& p,
                                           bool is_mouse_gesture) {
   const Extension* extension = profile_->GetExtensionService()->
       GetExtensionById(page_action()->extension_id(), false);
   if (!extension->ShowConfigureContextMenus())
     return;
 
   Browser* browser = BrowserView::GetBrowserViewForNativeWindow(
       platform_util::GetTopLevel(GetWidget()->GetNativeView()))->browser();
-  context_menu_contents_ =
-      new ExtensionContextMenuModel(extension, browser, this);
-  context_menu_menu_.reset(new views::Menu2(context_menu_contents_.get()));
-  context_menu_menu_->RunContextMenuAt(p);
+
+  scoped_refptr<ExtensionContextMenuModel> context_menu_model(
+      new ExtensionContextMenuModel(extension, browser, this));
+  views::MenuModelAdapter menu_model_adapter(context_menu_model.get());
+  views::MenuItemView menu(&menu_model_adapter);
+  menu_model_adapter.BuildMenu(&menu);
+
+  gfx::Point screen_loc;
+  views::View::ConvertPointToScreen(this, &screen_loc);
+  menu.RunMenuAt(GetWidget()->GetNativeWindow(), NULL,
+      gfx::Rect(screen_loc ,size()), views::MenuItemView::TOPLEFT, true);
 }
 
 void PageActionImageView::OnImageLoaded(
     SkBitmap* image, const ExtensionResource& resource, int index) {
   // We loaded icons()->size() icons, plus one extra if the page action had
   // a default icon.
   int total_icons = static_cast<int>(page_action_->icon_paths()->size());
   if (!page_action_->default_icon_path().empty())
     total_icons++;
   DCHECK(index < total_icons);
@@ skipping 67 matching lines @@
 void PageActionImageView::ExtensionPopupIsClosing(ExtensionPopup* popup) {
   DCHECK_EQ(popup_, popup);
   // ExtensionPopup is ref-counted, so we don't need to delete it.
   popup_ = NULL;
 }
 
 void PageActionImageView::HidePopup() {
   if (popup_)
     popup_->Close();
 }