Remove Inspect Popup command from browser actions.

chrome/browser/ui/gtk/browser_actions_toolbar_gtk.cc

 // Copyright (c) 2012 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/ui/gtk/browser_actions_toolbar_gtk.h"
 
 #include <gtk/gtk.h>
 
 #include <algorithm>
 #include <vector>
@@ skipping 71 matching lines @@
   return std::max((kButtonWidth + kButtonPadding) * icon_count - kButtonPadding,
                   0);
 }
 
 }  // namespace
 
 using ui::SimpleMenuModel;
 
 class BrowserActionButton : public content::NotificationObserver,
                             public ImageLoadingTracker::Observer,
-                            public ExtensionContextMenuModel::PopupDelegate,
                             public MenuGtk::Delegate {
  public:
   BrowserActionButton(BrowserActionsToolbarGtk* toolbar,
                       const Extension* extension,
                       ThemeServiceGtk* theme_provider)
       : toolbar_(toolbar),
         extension_(extension),
         image_(NULL),
         tracker_(this),
         tab_specific_icon_(NULL),
@@ skipping 131 matching lines @@
     } else {
       return default_skbitmap_;
     }
   }
 
   MenuGtk* GetContextMenu() {
     if (!extension_->ShowConfigureContextMenus())
       return NULL;
 
     context_menu_model_ =
-        new ExtensionContextMenuModel(extension_, toolbar_->browser(), this);
+        new ExtensionContextMenuModel(extension_, toolbar_->browser());
     context_menu_.reset(
         new MenuGtk(this, context_menu_model_.get()));
     return context_menu_.get();
   }
 
  private:
   // MenuGtk::Delegate implementation.
   virtual void StoppedShowing() {
     button_->UnsetPaintOverride();
 
     // If the context menu was showing for the overflow menu, re-assert the
     // grab that was shadowed.
     if (toolbar_->overflow_menu_.get())
       gtk_util::GrabAllInput(toolbar_->overflow_menu_->widget());
   }
 
   virtual void CommandWillBeExecuted() {
     // If the context menu was showing for the overflow menu, and a command
     // is executed, then stop showing the overflow menu.
     if (toolbar_->overflow_menu_.get())
       toolbar_->overflow_menu_->Cancel();
   }
 
   // Returns true to prevent further processing of the event that caused us to
   // show the popup, or false to continue processing.
-  bool ShowPopup(bool devtools) {
+  bool ShowPopup() {
     ExtensionAction* browser_action = extension_->browser_action();
 
     int tab_id = toolbar_->GetCurrentTabId();
     if (tab_id < 0) {
       NOTREACHED() << "No current tab.";
       return true;
     }
 
     if (browser_action->HasPopup(tab_id)) {
       ExtensionPopupGtk::Show(
-          browser_action->GetPopupUrl(tab_id), toolbar_->browser(),
-          widget(), devtools);
+          browser_action->GetPopupUrl(tab_id), toolbar_->browser(), widget());
       return true;
     }
 
     return false;
   }
 
-  // ExtensionContextMenuModel::PopupDelegate implementation.
-  virtual void InspectPopup(ExtensionAction* action) {
-    ShowPopup(true);
-  }
-
   void SetImage(GdkPixbuf* image) {
     if (!image_) {
       image_ = gtk_image_new_from_pixbuf(image);
       gtk_button_set_image(GTK_BUTTON(button()), image_);
     } else {
       gtk_image_set_from_pixbuf(GTK_IMAGE(image_), image);
     }
   }
 
   static gboolean OnButtonPress(GtkWidget* widget,
                                 GdkEventButton* event,
                                 BrowserActionButton* action) {
     if (event->button != 3)
       return FALSE;
 
     MenuGtk* menu = action->GetContextMenu();
     if (!menu)
       return FALSE;
 
     action->button_->SetPaintOverride(GTK_STATE_ACTIVE);
     menu->PopupForWidget(widget, event->button, event->time);
 
     return TRUE;
   }
 
   static void OnClicked(GtkWidget* widget, BrowserActionButton* action) {
-    if (action->ShowPopup(false))
+    if (action->ShowPopup())
       return;
 
     ExtensionService* service =
         action->toolbar_->browser()->profile()->GetExtensionService();
     service->browser_event_router()->BrowserActionExecuted(
         action->toolbar_->browser()->profile(), action->extension_->id(),
         action->toolbar_->browser());
   }
 
   static gboolean OnExposeEvent(GtkWidget* widget,
@@ skipping 458 matching lines @@
   ExtensionAction* browser_action = extension->browser_action();
 
   int tab_id = GetCurrentTabId();
   if (tab_id < 0) {
     NOTREACHED() << "No current tab.";
     return;
   }
 
   if (browser_action->HasPopup(tab_id)) {
     ExtensionPopupGtk::Show(
-        browser_action->GetPopupUrl(tab_id), browser(),
-        chevron(),
-        false);
+        browser_action->GetPopupUrl(tab_id), browser(), chevron());
   } else {
     ExtensionService* service = browser()->profile()->GetExtensionService();
     service->browser_event_router()->BrowserActionExecuted(
         browser()->profile(), extension->id(), browser());
   }
 }
 
 void BrowserActionsToolbarGtk::StoppedShowing() {
   overflow_button_->UnsetPaintOverride();
 }
@@ skipping 266 matching lines @@
 
   menu->PopupAsContext(gfx::Point(event->x_root, event->y_root),
                        event->time);
   return TRUE;
 }
 
 void BrowserActionsToolbarGtk::OnButtonShowOrHide(GtkWidget* sender) {
   if (!resize_animation_.is_animating())
     UpdateChevronVisibility();
 }