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

chrome/browser/debugger/devtools_window.cc

Index: chrome/browser/debugger/devtools_window.cc
diff --git a/chrome/browser/debugger/devtools_window.cc b/chrome/browser/debugger/devtools_window.cc
index 97c97c04ba3927f624248d5873e7aa08c99694ec..536b3b6e0a73c4470f11fe742a5282dc4c385273 100644
--- a/chrome/browser/debugger/devtools_window.cc
+++ b/chrome/browser/debugger/devtools_window.cc
@@ -103,7 +103,15 @@ TabContents* DevToolsWindow::GetDevToolsContents(WebContents* inspected_tab) {
 
 // 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
@@ -608,14 +616,6 @@ 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();
@@ -663,19 +663,6 @@ DevToolsWindow* DevToolsWindow::AsDevToolsWindow(
   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()) {