[DevTools] Ignore docking calls after closing started.

chrome/browser/devtools/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 "chrome/browser/devtools/devtools_window.h"
 #include <algorithm>
 
 #include "base/command_line.h"
 #include "base/json/json_reader.h"
 #include "base/json/json_writer.h"
@@ skipping 464 matching lines @@
 // static
 int DevToolsWindow::GetMinimizedHeight() {
   const int kMinimizedDevToolsHeight = 24;
   return kMinimizedDevToolsHeight;
 }
 
 void DevToolsWindow::InspectedContentsClosing() {
   intercepted_page_beforeunload_ = false;
   // This will prevent any activity after frontend is loaded.
   action_on_load_ = DevToolsToggleAction::NoOp();
+  ignore_set_is_docked_ = true;
   web_contents_->GetRenderViewHost()->ClosePage();
 }
 
 content::RenderViewHost* DevToolsWindow::GetRenderViewHost() {
   return web_contents_->GetRenderViewHost();
 }
 
 gfx::Insets DevToolsWindow::GetContentsInsets() const {
   return contents_insets_;
 }
@@ skipping 150 matching lines @@
                                bool can_dock)
     : profile_(profile),
       browser_(NULL),
       is_docked_(true),
       can_dock_(can_dock),
       // This initialization allows external front-end to work without changes.
       // We don't wait for docking call, but instead immediately show undocked.
       // Passing "dockSide=undocked" parameter ensures proper UI.
       load_state_(can_dock ? kNotLoaded : kIsDockedSet),
       action_on_load_(DevToolsToggleAction::NoOp()),
-      ignore_set_is_docked_for_test_(false),
+      ignore_set_is_docked_(false),
       intercepted_page_beforeunload_(false),
       weak_factory_(this) {
   web_contents_ =
       content::WebContents::Create(content::WebContents::CreateParams(profile));
   frontend_contents_observer_.reset(new FrontendWebContentsObserver(this));
 
   // Set up delegate, so we get fully-functional window immediately.
   // It will not appear in UI though until |load_state_ == kLoadCompleted|.
   web_contents_->SetDelegate(this);
 
@@ skipping 166 matching lines @@
     inspected_web_contents->GetDelegate()->AddNewContents(
         source, new_contents, disposition, initial_pos, user_gesture,
         was_blocked);
   }
 }
 
 void DevToolsWindow::CloseContents(content::WebContents* source) {
   CHECK(is_docked_);
   // This will prevent any activity after frontend is loaded.
   action_on_load_ = DevToolsToggleAction::NoOp();
+  ignore_set_is_docked_ = true;
   // Update dev tools to reflect removed dev tools window.
   BrowserWindow* inspected_window = GetInspectedBrowserWindow();
   if (inspected_window)
     inspected_window->UpdateDevTools();
   // In case of docked web_contents_, we own it so delete here.
   // Embedding DevTools window will be deleted as a result of
   // WebContentsDestroyed callback.
   delete web_contents_;
 }
 
@@ skipping 119 matching lines @@
     inspected_tab->GetDelegate()->ActivateContents(inspected_tab);
   } else {
     browser_->window()->Activate();
   }
 }
 
 void DevToolsWindow::CloseWindow() {
   DCHECK(is_docked_);
   // This will prevent any activity after frontend is loaded.
   action_on_load_ = DevToolsToggleAction::NoOp();
+  ignore_set_is_docked_ = true;
   web_contents_->GetRenderViewHost()->FirePageBeforeUnload(false);
 }
 
 void DevToolsWindow::SetContentsInsets(
     int top, int left, int bottom, int right) {
   if (contents_insets_.top() == top &&
       contents_insets_.left() == left &&
       contents_insets_.bottom() == bottom &&
       contents_insets_.right() == right) {
     return;
@@ skipping 24 matching lines @@
     is_docked_ = is_docked;
     // Load is completed when both kIsDockedSet and kOnLoadFired happened.
     // Note that kIsDockedSet may be already set when can_dock_ is false.
     load_state_ = load_state_ == kOnLoadFired ? kLoadCompleted : kIsDockedSet;
     // Note that action_on_load_ will be performed after the load is actually
     // completed. For now, just show the window.
     Show(DevToolsToggleAction::Show());
     if (load_state_ == kLoadCompleted)
       LoadCompleted();
   }
-  ignore_set_is_docked_for_test_ = true;
+  ignore_set_is_docked_ = true;
 }
 
 void DevToolsWindow::SetIsDocked(bool dock_requested) {
-  if (ignore_set_is_docked_for_test_)
+  if (ignore_set_is_docked_)
     return;
 
   DCHECK(can_dock_ || !dock_requested);
   if (!can_dock_)
     dock_requested = false;
 
   bool was_docked = is_docked_;
   is_docked_ = dock_requested;
 
   if (load_state_ != kLoadCompleted) {
@@ skipping 433 matching lines @@
   if (load_state_ == kLoadCompleted)
     LoadCompleted();
 }
 
 void DevToolsWindow::LoadCompleted() {
   Show(action_on_load_);
   action_on_load_ = DevToolsToggleAction::NoOp();
   UpdateTheme();
   AddDevToolsExtensionsToClient();
 }