Close detached DevTools window (rather than open a new instance) when it receives an F12 keypress

chrome/browser/debugger/devtools_window.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 <algorithm>
 
 #include "base/command_line.h"
 #include "base/json/json_writer.h"
 #include "base/lazy_instance.h"
 #include "base/string_number_conversions.h"
@@ skipping 85 matching lines @@
   DevToolsManager* manager = DevToolsManager::GetInstance();
   DevToolsClientHost* client_host = manager->GetDevToolsClientHostFor(agent);
   DevToolsWindow* window = AsDevToolsWindow(client_host);
   if (!window || !window->is_docked())
     return NULL;
   return window->tab_contents();
 }
 
 // static
 bool DevToolsWindow::IsDevToolsWindow(RenderViewHost* window_rvh) {
-  if (g_instances == NULL)
-    return false;
-  DevToolsWindowList& instances = g_instances.Get();
-  for (DevToolsWindowList::iterator it = instances.begin();
-       it != instances.end(); ++it) {
-    if ((*it)->tab_contents_->web_contents()->GetRenderViewHost() == window_rvh)
-      return true;
-  }
-  return false;
+  return AsDevToolsWindow(window_rvh) != NULL;

[pfeldman, 2012/08/24 10:16:14]

drop the != NULL

[apavlov, 2012/08/24 11:02:13]

Done.

 }
 
 // static
 DevToolsWindow* DevToolsWindow::OpenDevToolsWindowForWorker(
     Profile* profile,
     DevToolsAgentHost* worker_agent) {
   DevToolsWindow* window;
   DevToolsClientHost* client = content::DevToolsManager::GetInstance()->
       GetDevToolsClientHostFor(worker_agent);
   if (client) {
     window = AsDevToolsWindow(client);
     if (!window)
       return NULL;
   } else {
     window = DevToolsWindow::CreateDevToolsWindowForWorker(profile);
     DevToolsManager::GetInstance()->RegisterDevToolsClientHostFor(
         worker_agent,
         window->frontend_host_);
   }
-  window->Show(DEVTOOLS_TOGGLE_ACTION_NONE);
+  window->Show(DEVTOOLS_TOGGLE_ACTION_SHOW);
   return window;
 }
 
 // static
 DevToolsWindow* DevToolsWindow::CreateDevToolsWindowForWorker(
     Profile* profile) {
   return Create(profile, NULL, false, true);
 }
 
 // static
 DevToolsWindow* DevToolsWindow::OpenDevToolsWindow(
     RenderViewHost* inspected_rvh) {
   return ToggleDevToolsWindow(inspected_rvh, true,
-                              DEVTOOLS_TOGGLE_ACTION_NONE);
+                              DEVTOOLS_TOGGLE_ACTION_SHOW);
 }
 
 // static
 DevToolsWindow* DevToolsWindow::ToggleDevToolsWindow(
-    RenderViewHost* inspected_rvh,
+    Browser* browser,
     DevToolsToggleAction action) {
+  RenderViewHost* inspected_rvh =
+      chrome::GetActiveWebContents(browser)->GetRenderViewHost();
+  if (action == DEVTOOLS_TOGGLE_ACTION_TOGGLE && browser->is_devtools()) {
+    chrome::CloseAllTabs(browser);
+    return AsDevToolsWindow(inspected_rvh);

[pfeldman, 2012/08/24 10:16:14]

This is always NULL.

[apavlov, 2012/08/24 11:02:13]

This is NULL for ordinary RVH's but not for the DevTools window RVH (when
browser->is_devtools()).

[pfeldman, 2012/08/24 11:23:19]

- So browser _is_ the devtools window
- Then there is no point in getting its active web contents (this is the
devtools front-end page). It is not _inspected_, so the code above is wrong.
- And AsDevToolsWindow for it will return the devtools that inspects the
devtools. It all sounds completely wrong.

+  }
+
   return ToggleDevToolsWindow(inspected_rvh,
-                              action == DEVTOOLS_TOGGLE_ACTION_INSPECT,
-                              action);
+                       action == DEVTOOLS_TOGGLE_ACTION_INSPECT,
+                       action);
 }
 
 void DevToolsWindow::InspectElement(RenderViewHost* inspected_rvh,
                                     int x,
                                     int y) {
   DevToolsAgentHost* agent = DevToolsAgentHostRegistry::GetDevToolsAgentHost(
       inspected_rvh);
   DevToolsManager::GetInstance()->InspectElement(agent, x, y);
   // TODO(loislo): we should initiate DevTools window opening from within
   // renderer. Otherwise, we still can hit a race condition here.
@@ skipping 22 matching lines @@
 DevToolsWindow::DevToolsWindow(TabContents* tab_contents,
                                Profile* profile,
                                RenderViewHost* inspected_rvh,
                                bool docked)
     : profile_(profile),
       inspected_tab_(NULL),
       tab_contents_(tab_contents),
       browser_(NULL),
       docked_(docked),
       is_loaded_(false),
-      action_on_load_(DEVTOOLS_TOGGLE_ACTION_NONE) {
+      action_on_load_(DEVTOOLS_TOGGLE_ACTION_SHOW) {
   frontend_host_ = DevToolsClientHost::CreateDevToolsFrontendHost(
       tab_contents->web_contents(),
       this);
   file_helper_.reset(new DevToolsFileHelper(profile, this));
 
   g_instances.Get().push_back(this);
   // Wipe out page icon so that the default application icon is used.
   NavigationEntry* entry =
       tab_contents_->web_contents()->GetController().GetActiveEntry();
   entry->GetFavicon().image = gfx::Image();
@@ skipping 131 matching lines @@
         tab_strip_model->GetIndexOfTabContents(tab_contents_));
     browser_ = NULL;
   } else {
     // Update inspected window to hide split and reset it.
     BrowserWindow* inspected_window = GetInspectedBrowserWindow();
     if (inspected_window) {
       inspected_window->UpdateDevTools();
       inspected_window = NULL;
     }
   }
-  Show(DEVTOOLS_TOGGLE_ACTION_NONE);
+  Show(DEVTOOLS_TOGGLE_ACTION_SHOW);
 }
 
 RenderViewHost* DevToolsWindow::GetRenderViewHost() {
   return tab_contents_->web_contents()->GetRenderViewHost();
 }
 
 void DevToolsWindow::CreateDevToolsBrowser() {
   // TODO(pfeldman): Make browser's getter for this key static.
   std::string wp_key;
   wp_key.append(prefs::kBrowserWindowPlacement);
@@ skipping 144 matching lines @@
 
 void DevToolsWindow::DoAction() {
   UpdateFrontendAttachedState();
   // TODO: these messages should be pushed through the WebKit API instead.
   switch (action_on_load_) {
     case DEVTOOLS_TOGGLE_ACTION_SHOW_CONSOLE:
       CallClientFunction("InspectorFrontendAPI.showConsole", NULL);
       break;
     case DEVTOOLS_TOGGLE_ACTION_INSPECT:
       CallClientFunction("InspectorFrontendAPI.enterInspectElementMode", NULL);
-    case DEVTOOLS_TOGGLE_ACTION_NONE:
+    case DEVTOOLS_TOGGLE_ACTION_SHOW:
+    case DEVTOOLS_TOGGLE_ACTION_TOGGLE:
       // Do nothing.
       break;
     default:
       NOTREACHED();
   }
-  action_on_load_ = DEVTOOLS_TOGGLE_ACTION_NONE;
+  action_on_load_ = DEVTOOLS_TOGGLE_ACTION_SHOW;
 }
 
 std::string SkColorToRGBAString(SkColor color) {
   // We convert the alpha using DoubleToString because StringPrintf will use
   // locale specific formatters (e.g., use , instead of . in German).
   return StringPrintf("rgba(%d,%d,%d,%s)", SkColorGetR(color),
       SkColorGetG(color), SkColorGetB(color),
       base::DoubleToString(SkColorGetA(color) / 255.0).c_str());
 }
 
@@ skipping 124 matching lines @@
     return NULL;
   DevToolsWindowList& instances = g_instances.Get();
   for (DevToolsWindowList::iterator it = instances.begin();
        it != instances.end(); ++it) {
     if ((*it)->frontend_host_ == client_host)
       return *it;
   }
   return NULL;
 }
 
+// static
+DevToolsWindow* DevToolsWindow::AsDevToolsWindow(RenderViewHost* rvh) {
+  if (g_instances == NULL)
+    return NULL;
+  DevToolsWindowList& instances = g_instances.Get();
+  for (DevToolsWindowList::iterator it = instances.begin();
+       it != instances.end(); ++it) {
+    if ((*it)->tab_contents_->web_contents()->GetRenderViewHost() == rvh)
+      return *it;
+  }
+  return NULL;
+}
+
 void DevToolsWindow::ActivateWindow() {
   if (!docked_) {
     if (!browser_->window()->IsActive()) {
       browser_->window()->Activate();
     }
   } else {
     BrowserWindow* inspected_window = GetInspectedBrowserWindow();
     if (inspected_window)
       tab_contents_->web_contents()->GetView()->Focus();
   }
@@ skipping 88 matching lines @@
 }
 
 void DevToolsWindow::UpdateBrowserToolbar() {
   if (!inspected_tab_)
     return;
   BrowserWindow* inspected_window = GetInspectedBrowserWindow();
   if (inspected_window)
     inspected_window->UpdateToolbar(inspected_tab_, false);
 }