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) {

[Evan Stade, 2012/04/13 17:09:01]

don't need the param any more

[benwells, 2012/04/16 02:20:32]

Done.

     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);

[Evan Stade, 2012/04/13 17:09:01]

I bet the devtools param is no longer needed in ExtensionPopupGtk either

[benwells, 2012/04/13 21:23:21]

Yep that's right, and true in some way for all ports. I was planning on doing
that later and had some really good reason but it was probably rationalization
for laziness.

I'll remove it for gtk now as I'm mainly on linux, and add todos for the other
ports. Doing them in separate patches is much simpler to manage.

[benwells, 2012/04/16 02:20:32]

Done.

       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,
@@ skipping 774 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();
 }