Convert BrowserActionsContainer context menu from Menu2 to MenuItemView.

chrome/browser/ui/views/browser_actions_container.h

 // 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.
 
 #ifndef CHROME_BROWSER_UI_VIEWS_BROWSER_ACTIONS_CONTAINER_H_
 #define CHROME_BROWSER_UI_VIEWS_BROWSER_ACTIONS_CONTAINER_H_
 #pragma once
 
 #include <set>
 #include <string>
@@ skipping 27 matching lines @@
 
 namespace gfx {
 class CanvasSkia;
 }
 
 namespace ui {
 class SlideAnimation;
 }
 
 namespace views {
-class Menu2;
+class MenuItemView;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // BrowserActionButton
 
 // The BrowserActionButton is a specialization of the MenuButton class.
 // It acts on a ExtensionAction, in this case a BrowserAction and handles
 // loading the image for the button asynchronously on the file thread.
 class BrowserActionButton : public views::MenuButton,
                             public views::ButtonListener,
@@ skipping 65 matching lines @@
   ExtensionAction* browser_action_;
 
   // The extension associated with the browser action we're displaying.
   const Extension* extension_;
 
   // The object that is waiting for the image loading to complete
   // asynchronously.
   ImageLoadingTracker tracker_;
 
   // Whether we are currently showing/just finished showing a context menu.
   bool showing_context_menu_;

[Peter Kasting, 2011/06/09 00:39:09]

Nit: This variable isn't needed; callers can just check whether
context_menu_menu_ is NULL.  That's safer against misuse.

[rhashimoto, 2011/06/09 01:15:27]

Done.

 
   // 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_;
 
   // The browser action shelf.
   BrowserActionsContainer* panel_;
 
   scoped_refptr<ExtensionContextMenuModel> context_menu_contents_;
-  scoped_ptr<views::Menu2> context_menu_menu_;
+  views::MenuItemView* context_menu_menu_;

[Peter Kasting, 2011/06/09 00:39:09]

Nit: Might want to comment:

// Only non-NULL while we're actually displaying the menu.

Seems like this could just be named |context_menu_|, too.

[rhashimoto, 2011/06/09 01:15:27]

Done.

 
   NotificationRegistrar registrar_;
 
   friend class DeleteTask<BrowserActionButton>;
 
   DISALLOW_COPY_AND_ASSIGN(BrowserActionButton);
 };
 
 
 ////////////////////////////////////////////////////////////////////////////////
@@ skipping 361 matching lines @@
 
   ScopedRunnableMethodFactory<BrowserActionsContainer> task_factory_;
 
   // Handles delayed showing of the overflow menu when hovering.
   ScopedRunnableMethodFactory<BrowserActionsContainer> show_menu_task_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(BrowserActionsContainer);
 };
 
 #endif  // CHROME_BROWSER_UI_VIEWS_BROWSER_ACTIONS_CONTAINER_H_