Extension context menu refactor

chrome/browser/gtk/browser_actions_toolbar_gtk.cc

 // 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.
 
 #include "chrome/browser/gtk/browser_actions_toolbar_gtk.h"
 
 #include <vector>
 
 #include "app/gfx/canvas_paint.h"
 #include "chrome/browser/browser.h"
-#include "chrome/browser/extensions/extension_action_context_menu_model.h"
 #include "chrome/browser/extensions/extension_browser_event_router.h"
+#include "chrome/browser/extensions/extension_context_menu_model.h"
 #include "chrome/browser/extensions/extensions_service.h"
 #include "chrome/browser/extensions/image_loading_tracker.h"
 #include "chrome/browser/gtk/cairo_cached_surface.h"
 #include "chrome/browser/gtk/extension_popup_gtk.h"
 #include "chrome/browser/gtk/gtk_chrome_button.h"
 #include "chrome/browser/gtk/gtk_chrome_shrinkable_hbox.h"
 #include "chrome/browser/gtk/gtk_theme_provider.h"
 #include "chrome/browser/gtk/gtk_util.h"
 #include "chrome/browser/gtk/menu_gtk.h"
 #include "chrome/browser/gtk/view_id_util.h"
@@ skipping 32 matching lines @@
 // The minimum width in pixels of the button hbox if |icon_count| icons are
 // showing.
 gint WidthForIconCount(gint icon_count) {
   return std::max((kButtonSize + kButtonPadding) * icon_count - kButtonPadding,
                   0);
 }
 
 }  // namespace
 
 class BrowserActionButton : public NotificationObserver,
-                            public ImageLoadingTracker::Observer {
+                            public ImageLoadingTracker::Observer,
+                            public ExtensionContextMenuModel::PopupDelegate {
  public:
   BrowserActionButton(BrowserActionsToolbarGtk* toolbar,
                       Extension* extension)
       : toolbar_(toolbar),
         extension_(extension),
         tracker_(NULL),
         tab_specific_icon_(NULL),
         default_icon_(NULL) {
     button_.Own(
         GtkThemeProvider::GetFrom(toolbar->profile_)->BuildChromeButton());
@@ skipping 94 matching lines @@
     const SkBitmap& image = extension_->browser_action()->GetIcon(
         toolbar_->GetCurrentTabId());
     if (!image.isNull()) {
       return image;
     } else {
       return default_skbitmap_;
     }
   }
 
  private:
+  // ExtensionContextMenuModel::PopupDelegate implementation.
+  virtual void InspectPopup(ExtensionAction* action) {
+    // TODO(estade): http://crbug.com/24477
+    NOTIMPLEMENTED();
+  }
+
   void SetImage(GdkPixbuf* image) {
     gtk_button_set_image(GTK_BUTTON(button_.get()),
         gtk_image_new_from_pixbuf(image));
   }
 
   static gboolean OnButtonPress(GtkWidget* widget,
                                 GdkEvent* event,
                                 BrowserActionButton* action) {
     if (event->button.button != 3)
       return FALSE;
 
-    // TODO(rafaelw): support inspecting popups.
-    if (!action->context_menu_model_.get()) {
-      action->context_menu_model_.reset(
-          new ExtensionActionContextMenuModel(action->extension_,
-              action->extension_->browser_action(),
-              action->toolbar_->browser()->profile()->GetPrefs(), NULL));
-    }
-
+    action->context_menu_model_.reset(
+        new ExtensionContextMenuModel(
+            action->extension_,
+            action->toolbar_->browser(),
+            action));
     action->context_menu_.reset(
         new MenuGtk(NULL, action->context_menu_model_.get()));
+    action->context_menu_->Popup(widget, event);
 
-    action->context_menu_->Popup(widget, event);
     return TRUE;
   }
 
   static void OnClicked(GtkWidget* widget, BrowserActionButton* action) {
     ExtensionAction* browser_action = action->extension_->browser_action();
 
     int tab_id = action->toolbar_->GetCurrentTabId();
     if (tab_id < 0) {
       NOTREACHED() << "No current tab.";
       return;
@@ skipping 55 matching lines @@
   // If the browser action has a default icon, it will be here.
   GdkPixbuf* default_icon_;
 
   // Same as |default_icon_|, but stored as SkBitmap.
   SkBitmap default_skbitmap_;
 
   NotificationRegistrar registrar_;
 
   // 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_;
 
   friend class BrowserActionsToolbarGtk;
 };
 
 // BrowserActionsToolbarGtk ----------------------------------------------------
 
 BrowserActionsToolbarGtk::BrowserActionsToolbarGtk(Browser* browser)
     : browser_(browser),
       profile_(browser->profile()),
       theme_provider_(GtkThemeProvider::GetFrom(browser->profile())),
@@ skipping 452 matching lines @@
 
     // TODO(estade): set the menu item's tooltip.
   }
 
   gtk_chrome_button_set_paint_state(GTK_CHROME_BUTTON(overflow),
                                     GTK_STATE_ACTIVE);
   overflow_menu_->PopupAsFromKeyEvent(overflow);
 
   return FALSE;
 }