Fix docking behaviour for devtools windows that don't have an associated browser window

chrome/browser/debugger/devtools_window.cc

 // Copyright (c) 2009 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 "app/l10n_util.h"
 #include "base/command_line.h"
 #include "chrome/browser/browser.h"
 #include "chrome/browser/browser_list.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/browser_window.h"
@@ skipping 103 matching lines @@
   }
 }
 
 void DevToolsWindow::Show(bool open_console) {
   if (docked_) {
     // Just tell inspected browser to update splitter.
     BrowserWindow* inspected_window = GetInspectedBrowserWindow();
     if (inspected_window) {
       tab_contents_->set_delegate(this);
       inspected_window->UpdateDevTools();
+      SetAttachedWindow();
       tab_contents_->view()->SetInitialFocus();
       return;
     } else {
       // Sometimes we don't know where to dock. Stay undocked.
       docked_ = false;
     }
   }
 
   if (!browser_)
     CreateDevToolsBrowser();
 
   browser_->window()->Show();
+  SetAttachedWindow();
   tab_contents_->view()->SetInitialFocus();
 
   if (open_console) {
     if (is_loaded_)
       OpenConsole();
     else
       open_console_on_load_ = true;
   }
+
 }
 
 void DevToolsWindow::Activate() {
   if (!docked_) {
     if (!browser_->window()->IsActive()) {
       browser_->window()->Activate();
     }
   } else {
     BrowserWindow* inspected_window = GetInspectedBrowserWindow();
     if (inspected_window)
       inspected_window->FocusDevTools();
   }
 }
 
 void DevToolsWindow::SetDocked(bool docked) {
   if (docked_ == docked) {
     return;
   }
+  if (docked && !GetInspectedBrowserWindow()) {
+    // Cannot dock, avoid window flashing due to close-reopen cycle.
+    return;
+  }
   docked_ = docked;
 
   if (docked) {
     // Detach window from the external devtools browser. It will lead to
     // the browser object's close and delete. Remove observer first.
     TabStripModel* tabstrip_model = browser_->tabstrip_model();
     tabstrip_model->DetachTabContentsAt(
         tabstrip_model->GetIndexOfTabContents(tab_contents_));
     browser_ = NULL;
   } else {
@@ skipping 46 matching lines @@
     for (int i = 0; i < browser->tab_count(); ++i) {
       TabContents* tab_contents = browser->GetTabContentsAt(i);
       if (tab_contents == inspected_tab_) {
         return browser->window();
       }
     }
   }
   return NULL;
 }
 
+void DevToolsWindow::SetAttachedWindow() {
+  tab_contents_->render_view_host()->
+      ExecuteJavascriptInWebFrame(
+          L"", docked_ ? L"WebInspector.setAttachedWindow(true);" :
+                         L"WebInspector.setAttachedWindow(false);");
+}
+
 void DevToolsWindow::Observe(NotificationType type,
                              const NotificationSource& source,
                              const NotificationDetails& details) {
   if (type == NotificationType::LOAD_STOP) {
-    tab_contents_->render_view_host()->
-        ExecuteJavascriptInWebFrame(
-            L"", docked_ ? L"WebInspector.setAttachedWindow(true);" :
-                           L"WebInspector.setAttachedWindow(false);");
+    SetAttachedWindow();
     is_loaded_ = true;
     if (open_console_on_load_) {
       OpenConsole();
       open_console_on_load_ = false;
     }
   } else if (type == NotificationType::TAB_CLOSING) {
     if (Source<NavigationController>(source).ptr() ==
             &tab_contents_->controller()) {
       // This happens when browser closes all of its tabs as a result
       // of window.Close event.
@@ skipping 21 matching lines @@
   return false;
 }
 
 void DevToolsWindow::HandleKeyboardEvent(const NativeWebKeyboardEvent& event) {
   if (docked_) {
     BrowserWindow* inspected_window = GetInspectedBrowserWindow();
     if (inspected_window)
       inspected_window->HandleKeyboardEvent(event);
   }
 }