Revert "Make F12 close an undocked DevTools window rather than open another DevTools window for thi…

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) {
-  return AsDevToolsWindow(window_rvh) != NULL;
+  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;
 }
 
 // static
 DevToolsWindow* DevToolsWindow::OpenDevToolsWindowForWorker(
     Profile* profile,
     DevToolsAgentHost* worker_agent) {
   DevToolsWindow* window;
   DevToolsClientHost* client = content::DevToolsManager::GetInstance()->
       GetDevToolsClientHostFor(worker_agent);
   if (client) {
@@ skipping 484 matching lines @@
     if (inspected_window)
       inspected_window->HandleKeyboardEvent(event);
   }
 }
 
 // static
 DevToolsWindow* DevToolsWindow::ToggleDevToolsWindow(
     RenderViewHost* inspected_rvh,
     bool force_open,
     DevToolsToggleAction action) {
-  if (!force_open) {
-    DevToolsWindow* currentDevToolsWindow = AsDevToolsWindow(inspected_rvh);
-    if (currentDevToolsWindow) {
-      chrome::CloseAllTabs(currentDevToolsWindow->browser());
-      return currentDevToolsWindow;
-    }
-  }
-
   DevToolsAgentHost* agent = DevToolsAgentHostRegistry::GetDevToolsAgentHost(
       inspected_rvh);
   DevToolsManager* manager = DevToolsManager::GetInstance();
   DevToolsClientHost* host = manager->GetDevToolsClientHostFor(agent);
   DevToolsWindow* window = AsDevToolsWindow(host);
   if (host != NULL && window == NULL) {
     // Break remote debugging / extension debugging session.
     manager->UnregisterDevToolsClientHostFor(agent);
   }
 
@@ skipping 27 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);
 }