Extension context menu refactor

chrome/browser/views/location_bar_view.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_LOCATION_BAR_VIEW_H_
 #define CHROME_BROWSER_VIEWS_LOCATION_BAR_VIEW_H_
 
 #include <string>
 #include <map>
 #include <vector>
 
 #include "app/gfx/font.h"
 #include "base/task.h"
 #include "chrome/browser/autocomplete/autocomplete_edit.h"
+#include "chrome/browser/extensions/extension_context_menu_model.h"
 #include "chrome/browser/extensions/image_loading_tracker.h"
 #include "chrome/browser/location_bar.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/browser/toolbar_model.h"
 #include "chrome/browser/views/browser_bubble.h"
-#include "chrome/browser/views/extensions/extension_action_context_menu.h"
 #include "chrome/browser/views/extensions/extension_popup.h"
 #include "chrome/browser/views/info_bubble.h"
 #include "chrome/common/content_settings_types.h"
 #include "chrome/common/notification_observer.h"
 #include "chrome/common/notification_registrar.h"
 #include "gfx/rect.h"
 #include "views/controls/image_view.h"
 #include "views/controls/label.h"
+#include "views/controls/menu/menu_2.h"
 #include "views/controls/native/native_view_host.h"
 #include "views/painter.h"
 
 #if defined(OS_WIN)
 #include "chrome/browser/autocomplete/autocomplete_edit_view_win.h"
 #else
 #include "chrome/browser/autocomplete/autocomplete_edit_view_gtk.h"
 #endif
 
+class Browser;
 class BubblePositioner;
 class CommandUpdater;
 class ContentSettingImageModel;
 class ExtensionAction;
 class ExtensionPopup;
 class GURL;
 class Profile;
 
 /////////////////////////////////////////////////////////////////////////////
 //
@@ skipping 47 matching lines @@
   // Returns the appropriate color for the desired kind, based on the user's
   // system theme.
   static SkColor GetColor(bool is_secure, ColorKind kind);
 
   // Updates the location bar.  We also reset the bar's permanent text and
   // security style, and, if |tab_for_state_restoring| is non-NULL, also restore
   // saved state that the tab holds.
   void Update(const TabContents* tab_for_state_restoring);
 
   void SetProfile(Profile* profile);
-  Profile* profile() { return profile_; }
+  Profile* profile() const { return profile_; }
 
   // Returns the current TabContents.
   TabContents* GetTabContents() const;
 
   // Sets |preview_enabled| for the PageAction View associated with this
   // |page_action|. If |preview_enabled| is true, the view will display the
   // PageActions icon even though it has not been activated by the extension.
   // This is used by the ExtensionInstalledBubble to preview what the icon
   // will look like for the user upon installation of the extension.
   void SetPreviewEnabledPageAction(ExtensionAction *page_action,
@@ skipping 288 matching lines @@
     const BubblePositioner* bubble_positioner_;
 
     DISALLOW_IMPLICIT_CONSTRUCTORS(ContentSettingImageView);
   };
   typedef std::vector<ContentSettingImageView*> ContentSettingViews;
 
   // PageActionImageView is used to display the icon for a given PageAction
   // and notify the extension when the icon is clicked.
   class PageActionImageView : public LocationBarImageView,
       public ImageLoadingTracker::Observer,
-      public ExtensionActionContextMenuModel::MenuDelegate,
+      public ExtensionContextMenuModel::PopupDelegate,
       public ExtensionPopup::Observer {
    public:
     PageActionImageView(LocationBarView* owner,
                         Profile* profile,
                         ExtensionAction* page_action,
                         const BubblePositioner* bubble_positioner);
     virtual ~PageActionImageView();
 
     ExtensionAction* page_action() { return page_action_; }
 
     int current_tab_id() { return current_tab_id_; }
 
     void set_preview_enabled(bool preview_enabled) {
       preview_enabled_ = preview_enabled;
     }
 
     // Overridden from view.
     virtual void OnMouseMoved(const views::MouseEvent& event);
     virtual bool OnMousePressed(const views::MouseEvent& event);
     virtual void OnMouseReleased(const views::MouseEvent& event, bool canceled);
 
     // Overridden from LocationBarImageView.
     virtual void ShowInfoBubble();
 
     // Overridden from ImageLoadingTracker.
     virtual void OnImageLoaded(SkBitmap* image, size_t index);
 
-    // Overridden from ExtensionActionContextMenuModel::MenuDelegate
-    virtual void ShowPopupForDevToolsWindow(Extension* extension,
-        ExtensionAction* extension_action);
+    // Overridden from ExtensionContextMenuModelModel::Delegate
+    virtual void InspectPopup(ExtensionAction* action);
 
     // Overriden from ExtensionPopup::Observer
     virtual void ExtensionPopupClosed(ExtensionPopup* popup);
 
     // Called to notify the PageAction that it should determine whether to be
     // visible or hidden. |contents| is the TabContents that is active, |url|
     // is the current page URL.
     void UpdateVisibility(TabContents* contents, const GURL& url);
 
     // Either notify listeners or show a popup depending on the page action.
@@ skipping 11 matching lines @@
 
     // The PageAction that this view represents. The PageAction is not owned by
     // us, it resides in the extension of this particular profile.
     ExtensionAction* page_action_;
 
     // A cache of bitmaps the page actions might need to show, mapped by path.
     typedef std::map<std::string, SkBitmap> PageActionMap;
     PageActionMap page_action_icons_;
 
     // The context menu for this page action.
-    scoped_ptr<ExtensionActionContextMenu> context_menu_;
+    scoped_ptr<ExtensionContextMenuModel> context_menu_contents_;
+    scoped_ptr<views::Menu2> context_menu_menu_;
 
     // The object that is waiting for the image loading to complete
     // asynchronously.
     ImageLoadingTracker* tracker_;
 
     // The tab id we are currently showing the icon for.
     int current_tab_id_;
 
     // The URL we are currently showing the icon for.
     GURL current_url_;
@@ skipping 78 matching lines @@
   bool ToggleVisibility(bool new_vis, views::View* view);
 
 #if defined(OS_WIN)
   // Helper for the Mouse event handlers that does all the real work.
   void OnMouseEvent(const views::MouseEvent& event, UINT msg);
 #endif
 
   // Helper to show the first run info bubble.
   void ShowFirstRunBubbleInternal(bool use_OEM_bubble);
 
+  // Current browser. Not owned by us.
+  Browser* browser_;
+
   // Current profile. Not owned by us.
   Profile* profile_;
 
   // The Autocomplete Edit field.
 #if defined(OS_WIN)
   scoped_ptr<AutocompleteEditViewWin> location_entry_;
 #else
   scoped_ptr<AutocompleteEditViewGtk> location_entry_;
 #endif
 
@@ skipping 58 matching lines @@
   // The positioner that places the omnibox and info bubbles.
   const BubblePositioner* bubble_positioner_;
 
   // Storage of string needed for accessibility.
   std::wstring accessible_name_;
 
   DISALLOW_COPY_AND_ASSIGN(LocationBarView);
 };
 
 #endif  // CHROME_BROWSER_VIEWS_LOCATION_BAR_VIEW_H_