Extension context menu refactor

chrome/browser/views/browser_actions_container.h

 // 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.
 
 #ifndef CHROME_BROWSER_VIEWS_BROWSER_ACTIONS_CONTAINER_H_
 #define CHROME_BROWSER_VIEWS_BROWSER_ACTIONS_CONTAINER_H_
 
 #include <set>
 #include <string>
 #include <vector>
 
 #include "app/slide_animation.h"
 #include "base/task.h"
-#include "chrome/browser/extensions/extension_action_context_menu_model.h"
+#include "chrome/browser/extensions/extension_context_menu_model.h"
 #include "chrome/browser/extensions/extension_toolbar_model.h"
 #include "chrome/browser/extensions/image_loading_tracker.h"
 #include "chrome/browser/views/browser_bubble.h"
 #include "chrome/browser/views/extensions/browser_action_overflow_menu_controller.h"
-#include "chrome/browser/views/extensions/extension_action_context_menu.h"
 #include "chrome/browser/views/extensions/extension_popup.h"
 #include "chrome/common/notification_observer.h"
 #include "chrome/common/notification_registrar.h"
 #include "views/controls/button/menu_button.h"
 #include "views/controls/menu/view_menu_delegate.h"
 #include "views/controls/resize_gripper.h"
 #include "views/view.h"
 
 class Browser;
 class BrowserActionsContainer;
 class BrowserActionOverflowMenuController;
 class BrowserActionsContainer;
 class Extension;
 class ExtensionAction;
 class ExtensionPopup;
 class PrefService;
 class Profile;
 
+namespace views {
+class Menu2;
+}
+
 ////////////////////////////////////////////////////////////////////////////////
 // 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,
                             public ImageLoadingTracker::Observer,
                             public NotificationObserver {
@@ skipping 61 matching lines @@
   // 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_;
 
   // The browser action shelf.
   BrowserActionsContainer* panel_;
 
+  scoped_ptr<ExtensionContextMenuModel> context_menu_contents_;
+  scoped_ptr<views::Menu2> context_menu_menu_;
+
   NotificationRegistrar registrar_;
 
   DISALLOW_COPY_AND_ASSIGN(BrowserActionButton);
 };
 
 
 ////////////////////////////////////////////////////////////////////////////////
 // BrowserActionView
 // A single section in the browser action container. This contains the actual
 // BrowserActionButton, as well as the logic to paint the badge.
@@ skipping 97 matching lines @@
 //
 ////////////////////////////////////////////////////////////////////////////////
 class BrowserActionsContainer
   : public views::View,
     public views::ViewMenuDelegate,
     public views::DragController,
     public views::ResizeGripper::ResizeGripperDelegate,
     public AnimationDelegate,
     public ExtensionToolbarModel::Observer,
     public BrowserActionOverflowMenuController::Observer,
-    public ExtensionActionContextMenuModel::MenuDelegate,
+    public ExtensionContextMenuModel::PopupDelegate,
     public ExtensionPopup::Observer {
 
   friend class ShowFolderMenuTask;
  public:
   BrowserActionsContainer(Browser* browser, views::View* owner_view);
   virtual ~BrowserActionsContainer();
 
   static void RegisterUserPrefs(PrefService* prefs);
 
   // Get the number of browser actions being displayed.
   int num_browser_actions() const { return browser_action_views_.size(); }
 
   // Whether we are performing resize animation on the container.
   bool animating() const { return animation_target_size_ > 0; }
 
   // Returns the chevron, if any.
   const views::View* chevron() const { return chevron_; }
 
   // Returns the profile this container is associated with.
   Profile* profile() const { return profile_; }
 
-  // Returns the context menu for Browser Actions. Constructs the menu object if
-  // not constructed yet. This menu is used for all browser actions (regardless
-  // of whether they are in the overflow menu or not).
-  ExtensionActionContextMenu* GetContextMenu();
+  // Returns the browser this container is associated with.
+  Browser* browser() const { return browser_; }
 
   // Returns the current tab's ID, or -1 if there is no current tab.
   int GetCurrentTabId() const;
 
   // Get a particular browser action view.
   BrowserActionView* GetBrowserActionViewAt(int index) {
     return browser_action_views_[index];
   }
 
   // Retrieve the BrowserActionView for |extension|.
-  BrowserActionView* GetBrowserActionView(Extension* extension);
+  BrowserActionView* GetBrowserActionView(ExtensionAction* action);
 
   // Update the views to reflect the state of the browser action icons.
   void RefreshBrowserActionViews();
 
   // Sets up the browser action view vector.
   void CreateBrowserActionViews();
 
   // Delete all browser action views.
   void DeleteBrowserActionViews();
 
@@ skipping 39 matching lines @@
   virtual void OnResize(int resize_amount, bool done_resizing);
 
   // Overridden from AnimationDelegate:
   virtual void AnimationProgressed(const Animation* animation);
   virtual void AnimationEnded(const Animation* animation);
 
   // Overridden from BrowserActionOverflowMenuController::Observer:
   virtual void NotifyMenuDeleted(
       BrowserActionOverflowMenuController* controller);
 
-  // Overridden from ExtensionActionContextMenuModel::MenuDelegate
-  virtual void ShowPopupForDevToolsWindow(Extension* extension,
-      ExtensionAction* extension_action);
+  // Overridden from ExtensionContextMenuModel::PopupDelegate
+  virtual void InspectPopup(ExtensionAction* action);
 
   // Overriden from ExtensionPopup::Delegate
   virtual void ExtensionPopupClosed(ExtensionPopup* popup);
 
   // Moves a browser action with |id| to |new_index|.
   void MoveBrowserAction(const std::string& extension_id, size_t new_index);
 
   // Hide the current popup.
   void HidePopup();
 
@@ skipping 14 matching lines @@
   static bool disable_animations_during_testing_;
 
  private:
   typedef std::vector<BrowserActionView*> BrowserActionViews;
 
   // ExtensionToolbarModel::Observer implementation.
   virtual void BrowserActionAdded(Extension* extension, int index);
   virtual void BrowserActionRemoved(Extension* extension);
   virtual void BrowserActionMoved(Extension* extension, int index);
 
-  // Closes the overflow and context menu if open.
-  void CloseMenus();
+  // Closes the overflow menu if open.
+  void CloseOverflowMenu();
 
   // Cancels the timer for showing the drop down menu.
   void StopShowFolderDropMenuTimer();
 
   // Show the drop down folder after a slight delay.
   void StartShowFolderDropMenuTimer();
 
   // Show the overflow menu.
   void ShowDropFolder();
 
@@ skipping 61 matching lines @@
   // The resize gripper for the container.
   views::ResizeGripper* resize_gripper_;
 
   // The chevron for accessing the overflow items.
   views::MenuButton* chevron_;
 
   // The menu to show for the overflow button (chevron). This class manages its
   // own lifetime so that it can stay alive during drag and drop operations.
   BrowserActionOverflowMenuController* overflow_menu_;
 
-  // The context menu that the overflow menu shows. Is NULL until the menu is
-  // shown for the first time.
-  scoped_ptr<ExtensionActionContextMenu> context_menu_;
-
   // The animation that happens when the container snaps to place.
   scoped_ptr<SlideAnimation> resize_animation_;
 
   // Don't show the chevron while animating.
   bool suppress_chevron_;
 
   // This is used while the user is resizing (and when the animations are in
   // progress) to know how wide the delta is between the current state and what
   // we should draw.
   int resize_amount_;
 
   // Keeps track of the absolute pixel width the container should have when we
   // are done animating.
   int animation_target_size_;
 
   // The x position for where to draw the drop indicator. -1 if no indicator.
   int drop_indicator_position_;
 
   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_VIEWS_BROWSER_ACTIONS_CONTAINER_H_