Refactor ExtensionActionContextMenuModel.

- Simplify constructor
- Rename to ExtensionContextMenuModel.*
- Remove views/extension_action_context_menu.*

BUG=none
TEST=none

Review URL: http://codereview.chromium.org/1107007

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@42271 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 8 insertions, 6 deletions

diff --git a/chrome/browser/gtk/location_bar_view_gtk.h b/chrome/browser/gtk/location_bar_view_gtk.h
index 1da0e7a..2037a2e 100644
--- a/chrome/browser/gtk/location_bar_view_gtk.h
+++ b/chrome/browser/gtk/location_bar_view_gtk.h
@@ -15,6 +15,7 @@
 #include "base/scoped_vector.h"
 #include "chrome/browser/autocomplete/autocomplete_edit.h"
 #include "chrome/browser/autocomplete/autocomplete_edit_view_gtk.h"
+#include "chrome/browser/extensions/extension_context_menu_model.h"
 #include "chrome/browser/extensions/image_loading_tracker.h"
 #include "chrome/browser/gtk/info_bubble_gtk.h"
 #include "chrome/browser/gtk/menu_gtk.h"
@@ -34,7 +35,6 @@ class CommandUpdater;
 class ContentSettingImageModel;
 class ContentSettingBubbleGtk;
 class ExtensionAction;
-class ExtensionActionContextMenuModel;
 class GtkThemeProvider;
 class Profile;
 class SkBitmap;
@@ -46,9 +46,7 @@ class LocationBarViewGtk : public AutocompleteEditController,
                            public LocationBarTesting,
                            public NotificationObserver {
  public:
-  LocationBarViewGtk(CommandUpdater* command_updater,
-                     ToolbarModel* toolbar_model,
-                     const BubblePositioner* bubble_positioner,
+  LocationBarViewGtk(const BubblePositioner* bubble_positioner,
                      Browser* browser_);
   virtual ~LocationBarViewGtk();
 
@@ -171,7 +169,8 @@ class LocationBarViewGtk : public AutocompleteEditController,
     DISALLOW_COPY_AND_ASSIGN(ContentSettingImageViewGtk);
   };
 
-  class PageActionViewGtk : public ImageLoadingTracker::Observer {
+  class PageActionViewGtk : public ImageLoadingTracker::Observer,
+                            public ExtensionContextMenuModel::PopupDelegate {
    public:
     PageActionViewGtk(
         LocationBarViewGtk* owner, Profile* profile,
@@ -199,6 +198,9 @@ class LocationBarViewGtk : public AutocompleteEditController,
     // Simulate left mouse click on the page action button.
     void TestActivatePageAction();
 
+    // Overridden from ExtensionContextMenuModel::PopupDelegate:
+    virtual void InspectPopup(ExtensionAction* action);
+
    private:
     static gboolean OnButtonPressedThunk(GtkWidget* sender,
                                          GdkEvent* event,
@@ -254,7 +256,7 @@ class LocationBarViewGtk : public AutocompleteEditController,
 
     // The context menu view and model for this extension action.
     scoped_ptr<MenuGtk> context_menu_;
-    scoped_ptr<ExtensionActionContextMenuModel> context_menu_model_;
+    scoped_ptr<ExtensionContextMenuModel> context_menu_model_;
 
     DISALLOW_COPY_AND_ASSIGN(PageActionViewGtk);
   };