Extension context menu refactor

chrome/browser/gtk/location_bar_view_gtk.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_GTK_LOCATION_BAR_VIEW_GTK_H_
 #define CHROME_BROWSER_GTK_LOCATION_BAR_VIEW_GTK_H_
 
 #include <gtk/gtk.h>
 
 #include <map>
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/scoped_ptr.h"
 #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"
 #include "chrome/browser/location_bar.h"
 #include "chrome/common/content_settings_types.h"
 #include "chrome/common/notification_observer.h"
 #include "chrome/common/notification_registrar.h"
 #include "chrome/common/owned_widget_gtk.h"
 #include "chrome/common/page_transition_types.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "webkit/glue/window_open_disposition.h"
 
 class AutocompleteEditViewGtk;
 class BubblePositioner;
 class Browser;
 class CommandUpdater;
 class ContentSettingImageModel;
 class ContentSettingBubbleGtk;
 class ExtensionAction;
-class ExtensionActionContextMenuModel;
 class GtkThemeProvider;
 class Profile;
 class SkBitmap;
 class TabContents;
 class ToolbarModel;
 
 class LocationBarViewGtk : public AutocompleteEditController,
                            public LocationBar,
                            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();
 
   void Init(bool popup_window_mode);
 
   void SetProfile(Profile* profile);
 
   // Returns the widget the caller should host.  You must call Init() first.
   GtkWidget* widget() { return hbox_.get(); }
 
@@ skipping 102 matching lines @@
 
     // The currently active profile.
     Profile* profile_;
 
     // The currently shown info bubble if any.
     ContentSettingBubbleGtk* info_bubble_;
 
     DISALLOW_COPY_AND_ASSIGN(ContentSettingImageViewGtk);
   };
 
-  class PageActionViewGtk : public ImageLoadingTracker::Observer {
+  class PageActionViewGtk : public ImageLoadingTracker::Observer,
+                            public ExtensionContextMenuModel::PopupDelegate {
    public:
     PageActionViewGtk(
         LocationBarViewGtk* owner, Profile* profile,
         ExtensionAction* page_action);
     virtual ~PageActionViewGtk();
 
     GtkWidget* widget() { return event_box_.get(); }
 
     ExtensionAction* page_action() { return page_action_; }
 
     void set_preview_enabled(bool preview_enabled) {
       preview_enabled_ = preview_enabled;
     }
 
     bool IsVisible() { return GTK_WIDGET_VISIBLE(widget()); }
 
     // 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, GURL url);
 
     // A callback from ImageLoadingTracker for when the image has loaded.
     virtual void OnImageLoaded(SkBitmap* image, size_t index);
 
     // 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,
                                          PageActionViewGtk* page_action_view) {
       return page_action_view->OnButtonPressed(sender, event);
     }
     gboolean OnButtonPressed(GtkWidget* sender, GdkEvent* event);
 
     static gboolean OnExposeEventThunk(GtkWidget* widget,
                                        GdkEventExpose* event,
@@ skipping 35 matching lines @@
 
     // The URL we are currently showing the icon for.
     GURL current_url_;
 
     // This is used for post-install visual feedback. The page_action icon
     // is briefly shown even if it hasn't been enabled by its extension.
     bool preview_enabled_;
 
     // 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);
   };
   friend class PageActionViewGtk;
 
   static gboolean HandleExposeThunk(GtkWidget* widget, GdkEventExpose* event,
                                     gpointer userdata) {
     return reinterpret_cast<LocationBarViewGtk*>(userdata)->
         HandleExpose(widget, event);
   }
@@ skipping 109 matching lines @@
   // Indicate if |tab_to_search_hint_| should be shown.
   bool show_keyword_hint_;
 
   // Indicate if |type_to_search_hint_| should be shown.
   bool show_search_hint_;
 
   DISALLOW_COPY_AND_ASSIGN(LocationBarViewGtk);
 };
 
 #endif  // CHROME_BROWSER_GTK_LOCATION_BAR_VIEW_GTK_H_