Convert BrowserActionsContainer context menu from Menu2 to MenuItemView.

chrome/browser/ui/views/browser_actions_container.h

Index: chrome/browser/ui/views/browser_actions_container.h
diff --git a/chrome/browser/ui/views/browser_actions_container.h b/chrome/browser/ui/views/browser_actions_container.h
index 07713d3309b4c579e55bad66cc4aa062cddd6bea..be95bd0f087ceb664610379ff584929f665b7b51 100644
--- a/chrome/browser/ui/views/browser_actions_container.h
+++ b/chrome/browser/ui/views/browser_actions_container.h
@@ -45,7 +45,7 @@ class SlideAnimation;
 }
 
 namespace views {
-class Menu2;
+class MenuItemView;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -130,9 +130,6 @@ class BrowserActionButton : public views::MenuButton,
   // asynchronously.
   ImageLoadingTracker tracker_;
 
-  // Whether we are currently showing/just finished showing a context menu.
-  bool showing_context_menu_;
-
   // The default icon for our browser action. This might be non-empty if the
   // browser action had a value for default_icon in the manifest.
   SkBitmap default_icon_;
@@ -140,8 +137,11 @@ class BrowserActionButton : public views::MenuButton,
   // The browser action shelf.
   BrowserActionsContainer* panel_;
 
+  // The context menu specification.
   scoped_refptr<ExtensionContextMenuModel> context_menu_contents_;
-  scoped_ptr<views::Menu2> context_menu_menu_;
+
+  // The context menu.  This member is non-NULL only when the menu is shown.
+  views::MenuItemView* context_menu_;
 
   NotificationRegistrar registrar_;