Remove Inspect Popup command from browser actions.

chrome/browser/ui/gtk/extensions/extension_popup_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/extensions/extension_popup_gtk.h"
 
 #include <gtk/gtk.h>
 
 #include <algorithm>
 
@@ skipping 23 matching lines @@
 // The minimum/maximum dimensions of the extension popup.
 // The minimum is just a little larger than the size of a browser action button.
 // The maximum is an arbitrary number that should be smaller than most screens.
 const int ExtensionPopupGtk::kMinWidth = 25;
 const int ExtensionPopupGtk::kMinHeight = 25;
 const int ExtensionPopupGtk::kMaxWidth = 800;
 const int ExtensionPopupGtk::kMaxHeight = 600;
 
 ExtensionPopupGtk::ExtensionPopupGtk(Browser* browser,
                                      ExtensionHost* host,
-                                     GtkWidget* anchor,
-                                     bool inspect)
+                                     GtkWidget* anchor)
     : browser_(browser),
       bubble_(NULL),
       host_(host),
       anchor_(anchor),
-      being_inspected_(inspect),
+      being_inspected_(false),
       weak_factory_(this) {
   host_->view()->SetContainer(this);
 
   // If the host had somehow finished loading, then we'd miss the notification
   // and not show.  This seems to happen in single-process mode.
   if (host->did_stop_loading()) {
     ShowPopup();
   } else {
     registrar_.Add(this, chrome::NOTIFICATION_EXTENSION_HOST_DID_STOP_LOADING,
                    content::Source<Profile>(host->profile()));
   }
 
   registrar_.Add(this, chrome::NOTIFICATION_EXTENSION_HOST_VIEW_SHOULD_CLOSE,
                  content::Source<Profile>(host->profile()));
 
   registrar_.Add(this, content::NOTIFICATION_DEVTOOLS_WINDOW_CLOSING,
                  content::Source<Profile>(host->profile()));
 
-  if (!being_inspected_) {
-    registrar_.Add(this, content::NOTIFICATION_DEVTOOLS_WINDOW_OPENING,
-                   content::Source<Profile>(host->profile()));
-  }
+  registrar_.Add(this, content::NOTIFICATION_DEVTOOLS_WINDOW_OPENING,
+                 content::Source<Profile>(host->profile()));
 }
 
 ExtensionPopupGtk::~ExtensionPopupGtk() {
 }
 
 // static
 void ExtensionPopupGtk::Show(const GURL& url, Browser* browser,
-    GtkWidget* anchor, bool inspect) {
+    GtkWidget* anchor) {
   ExtensionProcessManager* manager =
       browser->profile()->GetExtensionProcessManager();
   DCHECK(manager);
   if (!manager)
     return;
 
   ExtensionHost* host = manager->CreatePopupHost(url, browser);
   // This object will delete itself when the bubble is closed.
-  new ExtensionPopupGtk(browser, host, anchor, inspect);
+  new ExtensionPopupGtk(browser, host, anchor);
 }
 
 void ExtensionPopupGtk::Observe(int type,
                                 const content::NotificationSource& source,
                                 const content::NotificationDetails& details) {
   switch (type) {
     case chrome::NOTIFICATION_EXTENSION_HOST_DID_STOP_LOADING:
       if (content::Details<ExtensionHost>(host_.get()) == details)
         ShowPopup();
       break;
     case chrome::NOTIFICATION_EXTENSION_HOST_VIEW_SHOULD_CLOSE:
       if (content::Details<ExtensionHost>(host_.get()) == details)
         DestroyPopup();
       break;
     case content::NOTIFICATION_DEVTOOLS_WINDOW_OPENING:
       // Make sure it's the devtools window that is inspecting our popup.
       if (content::Details<RenderViewHost>(host_->render_view_host()) !=
           details)
         break;
 
       // Make sure that the popup won't go away when the inspector is activated.
       if (bubble_)
         bubble_->StopGrabbingInput();
+
+      being_inspected_ = true;
       break;
     case content::NOTIFICATION_DEVTOOLS_WINDOW_CLOSING:
       // Make sure it's the devtools window that is inspecting our popup.
       if (content::Details<RenderViewHost>(host_->render_view_host()) !=
           details)
         break;
 
       // If the devtools window is closing, we post a task to ourselves to
       // close the popup. This gives the devtools window a chance to finish
       // detaching from the inspected RenderViewHost.
@@ skipping 32 matching lines @@
   bubble_->Close();
   return true;
 }
 
 void ExtensionPopupGtk::ShowPopup() {
   if (bubble_) {
     NOTREACHED();
     return;
   }
 
-  if (being_inspected_)
-    DevToolsWindow::OpenDevToolsWindow(host_->render_view_host());
-
   // Only one instance should be showing at a time. Get rid of the old one, if
   // any. Typically, |current_extension_popup_| will be NULL, but it can be
   // non-NULL if a browser action button is clicked while another extension
   // popup's extension host is still loading.
   if (current_extension_popup_)
     current_extension_popup_->DestroyPopup();
   current_extension_popup_ = this;
 
   // We'll be in the upper-right corner of the window for LTR languages, so we
   // want to put the arrow at the upper-right corner of the bubble to match the
   // page and app menus.
   BubbleGtk::ArrowLocationGtk arrow_location =
       !base::i18n::IsRTL() ?
       BubbleGtk::ARROW_LOCATION_TOP_RIGHT :
       BubbleGtk::ARROW_LOCATION_TOP_LEFT;
   bubble_ = BubbleGtk::Show(anchor_,
                             NULL,
                             host_->view()->native_view(),
                             arrow_location,
                             false,  // match_system_theme
-                            !being_inspected_,  // grab_input
+                            true,   // grab_input
                             ThemeServiceGtk::GetFrom(browser_->profile()),
                             this);
 }
 
 void ExtensionPopupGtk::DestroyPopupWithoutResult() {
   DestroyPopup();
 }
 
 gfx::Rect ExtensionPopupGtk::GetViewBounds() {
   GtkAllocation allocation;
   gtk_widget_get_allocation(host_->view()->native_view(), &allocation);
   return gfx::Rect(allocation);
 }