GTK: allow inspecting of extension popups.

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"
@@ skipping 160 matching lines @@
     const SkBitmap& image = extension_->browser_action()->GetIcon(
         toolbar_->GetCurrentTabId());
     if (!image.isNull()) {
       return image;
     } else {
       return default_skbitmap_;
     }
   }
 
  private:
+  // 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) {
+    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(),
+          gtk_util::GetWidgetRectRelativeToToplevel(widget()),
+          devtools);
+      return true;
+    }
+
+    return false;
+  }
+
   // ExtensionContextMenuModel::PopupDelegate implementation.
   virtual void InspectPopup(ExtensionAction* action) {
-    // TODO(estade): http://crbug.com/24477
-    NOTIMPLEMENTED();
+    ShowPopup(true);
   }
 
   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;
 
     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);
 
     return TRUE;
   }
 
   static void OnClicked(GtkWidget* widget, BrowserActionButton* action) {
-    ExtensionAction* browser_action = action->extension_->browser_action();
+    if (action->ShowPopup(false))
+      return;
 
-    int tab_id = action->toolbar_->GetCurrentTabId();
-    if (tab_id < 0) {
-      NOTREACHED() << "No current tab.";
-      return;
-    }
-
-    if (browser_action->HasPopup(tab_id)) {
-      ExtensionPopupGtk::Show(
-          browser_action->GetPopupUrl(tab_id),
-          action->toolbar_->browser(),
-          gtk_util::GetWidgetRectRelativeToToplevel(widget));
-    } else {
-      ExtensionBrowserEventRouter::GetInstance()->BrowserActionExecuted(
-          action->toolbar_->browser()->profile(), action->extension_->id(),
-          action->toolbar_->browser());
-    }
+    ExtensionBrowserEventRouter::GetInstance()->BrowserActionExecuted(
+        action->toolbar_->browser()->profile(), action->extension_->id(),
+        action->toolbar_->browser());
   }
 
   static gboolean OnExposeEvent(GtkWidget* widget,
                                 GdkEventExpose* event,
                                 BrowserActionButton* button) {
     int tab_id = button->toolbar_->GetCurrentTabId();
     if (tab_id < 0)
       return FALSE;
 
     ExtensionAction* action = button->extension_->browser_action();
@@ skipping 295 matching lines @@
 
   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(),
-        gtk_util::GetWidgetRectRelativeToToplevel(overflow_button_.widget()));
+        gtk_util::GetWidgetRectRelativeToToplevel(overflow_button_.widget()),
+        false);
   } else {
     ExtensionBrowserEventRouter::GetInstance()->BrowserActionExecuted(
         browser()->profile(), extension->id(), browser());
   }
 }
 
 void BrowserActionsToolbarGtk::StoppedShowing() {
   gtk_chrome_button_unset_paint_state(
       GTK_CHROME_BUTTON(overflow_button_.widget()));
 }
@@ skipping 82 matching lines @@
                                                   GtkWidget* previous_toplevel) {
   GtkWidget* toplevel = gtk_widget_get_toplevel(widget);
   if (!GTK_WIDGET_TOPLEVEL(toplevel))
     return;
 
   g_signal_connect(toplevel, "set-focus", G_CALLBACK(OnSetFocusThunk), this);
 }
 
 void BrowserActionsToolbarGtk::OnSetFocus(GtkWidget* widget,
                                           GtkWidget* focus_widget) {
+  ExtensionPopupGtk* popup = ExtensionPopupGtk::get_current_extension_popup();
   // The focus of the parent window has changed. Close the popup. Delay the hide
   // because it will destroy the RenderViewHost, which may still be on the
   // call stack.
-  if (!ExtensionPopupGtk::get_current_extension_popup())
+  if (!popup || popup->being_inspected())
     return;
   MessageLoop::current()->PostTask(FROM_HERE,
       method_factory_.NewRunnableMethod(&BrowserActionsToolbarGtk::HidePopup));
 }
 
 gboolean BrowserActionsToolbarGtk::OnGripperMotionNotify(
     GtkWidget* widget, GdkEventMotion* event) {
   if (!(event->state & GDK_BUTTON1_MASK))
     return FALSE;
 
@@ skipping 84 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;
 }