Enable devtools via context menu in platform apps and popup extensions.

chrome/browser/ui/views/extensions/extension_popup.cc

 // Copyright (c) 2011 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/views/extensions/extension_popup.h"
 
 #include "base/bind.h"
 #include "base/message_loop.h"
 #include "chrome/browser/debugger/devtools_window.h"
 #include "chrome/browser/extensions/extension_process_manager.h"
@@ skipping 40 matching lines @@
 #endif
 
   // Wait to show the popup until the contained host finishes loading.
   registrar_.Add(this, content::NOTIFICATION_LOAD_COMPLETED_MAIN_FRAME,
                  content::Source<WebContents>(host->host_contents()));
 
   // Listen for the containing view calling window.close();
   registrar_.Add(this, chrome::NOTIFICATION_EXTENSION_HOST_VIEW_SHOULD_CLOSE,
                  content::Source<Profile>(host->profile()));
 
+  if (!inspect_with_devtools_) {
+    // Listen for the dev tools opening on this popup, so we can stop it going
+    // away when the dev tools get focus.
+    registrar_.Add(this, content::NOTIFICATION_DEVTOOLS_WINDOW_OPENING,
+                   content::Source<Profile>(host->profile()));
+  }
+
   views::WidgetFocusManager::GetInstance()->AddFocusChangeListener(this);
 }
 
 ExtensionPopup::~ExtensionPopup() {
   views::WidgetFocusManager::GetInstance()->RemoveFocusChangeListener(this);
 }
 
 void ExtensionPopup::Observe(int type,
                              const content::NotificationSource& source,
                              const content::NotificationDetails& details) {
@@ skipping 18 matching lines @@
         GetWidget()->Close();
       break;
     case content::NOTIFICATION_DEVTOOLS_WINDOW_CLOSING:
       // Make sure its the devtools window that inspecting our popup.
       // Widget::Close posts a task, which should give the devtools window a
       // chance to finish detaching from the inspected RenderViewHost.
       if (content::Details<RenderViewHost>(
               host()->render_view_host()) == details)
         GetWidget()->Close();
       break;
+    case content::NOTIFICATION_DEVTOOLS_WINDOW_OPENING:
+      // First check that the devtools are being opened on this popup.
+      if (content::Details<RenderViewHost>(
+              host()->render_view_host()) == details) {

[not at google - send to devlin, 2012/01/23 05:43:51]

<- 2 indent

[benwells, 2012/01/23 06:42:23]

OK, I think I've fixed it and the similar code above.

+        // Set inspect_with_devtools_ so the popup will be kept open while
+        // the devtools are open.
+        inspect_with_devtools_ = true;
+        // Listen for the devtools being closed so the popup can be closed.
+        registrar_.Add(this, content::NOTIFICATION_DEVTOOLS_WINDOW_CLOSING,
+            content::Source<content::BrowserContext>(host()->profile()));
+      }
+      break;
     default:
       NOTREACHED() << L"Received unexpected notification";
   }
 }
 
 void ExtensionPopup::OnExtensionPreferredSizeChanged(ExtensionView* view) {
   SizeToContents();
 }
 
 gfx::Size ExtensionPopup::GetPreferredSize() {
@@ skipping 42 matching lines @@
   // 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()) {
     popup->Show();
     // Focus on the host contents when the bubble is first shown.
     host->host_contents()->Focus();
   }
 
   return popup;
 }