DevTools: allow reattaching main target live.

chrome/browser/devtools/devtools_ui_bindings.cc

 // Copyright 2014 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_ui_bindings.h"
 
 #include <stddef.h>
 
 #include <memory>
 #include <utility>
@@ skipping 384 matching lines @@
  return NULL;
 }
 
 DevToolsUIBindings::DevToolsUIBindings(content::WebContents* web_contents)
     : profile_(Profile::FromBrowserContext(web_contents->GetBrowserContext())),
       android_bridge_(DevToolsAndroidBridge::Factory::GetForProfile(profile_)),
       web_contents_(web_contents),
       delegate_(new DefaultBindingsDelegate(web_contents_)),
       devices_updates_enabled_(false),
       frontend_loaded_(false),
-      reattaching_(false),
+      reloading_(false),
       weak_factory_(this) {
   g_instances.Get().push_back(this);
   frontend_contents_observer_.reset(new FrontendWebContentsObserver(this));
   web_contents_->GetMutableRendererPrefs()->can_accept_load_drops = false;
 
   file_helper_.reset(new DevToolsFileHelper(web_contents_, profile_, this));
   file_system_indexer_ = new DevToolsFileSystemIndexer();
   extensions::ChromeExtensionWebContentsObserver::CreateForWebContents(
       web_contents_);
 
@@ skipping 433 matching lines @@
                               prefs::kDevToolsPreferences);
   update.Get()->RemoveWithoutPathExpansion(name, nullptr);
 }
 
 void DevToolsUIBindings::ClearPreferences() {
   DictionaryPrefUpdate update(profile_->GetPrefs(),
                               prefs::kDevToolsPreferences);
   update.Get()->Clear();
 }
 
+void DevToolsUIBindings::Reattach(const DispatchCallback& callback) {
+  DCHECK(agent_host_.get());
+  agent_host_->DetachClient(this);
+  agent_host_->AttachClient(this);
+  callback.Run(nullptr);
+}
+
 void DevToolsUIBindings::ReadyForTest() {
   delegate_->ReadyForTest();
 }
 
 void DevToolsUIBindings::DispatchProtocolMessageFromDevToolsFrontend(
     const std::string& message) {
   if (agent_host_.get())
     agent_host_->DispatchProtocolMessage(this, message);
 }
 
@@ skipping 230 matching lines @@
 void DevToolsUIBindings::AttachTo(
     const scoped_refptr<content::DevToolsAgentHost>& agent_host) {
   if (agent_host_.get())
     Detach();
   agent_host_ = agent_host;
   // DevToolsUIBindings terminates existing debugging connections and starts
   // debugging.
   agent_host_->ForceAttachClient(this);
 }
 
-void DevToolsUIBindings::Reattach() {
+void DevToolsUIBindings::Reload() {
   DCHECK(agent_host_.get());
-  reattaching_ = true;
+  reloading_ = true;
+  web_contents_->GetController().Reload(false);
 }
 
 void DevToolsUIBindings::Detach() {
   if (agent_host_.get())
     agent_host_->DetachClient(this);
   agent_host_ = NULL;
 }
 
 bool DevToolsUIBindings::IsAttachedTo(content::DevToolsAgentHost* agent_host) {
   return agent_host_.get() == agent_host;
@@ skipping 16 matching lines @@
         javascript.append(", ").append(json);
       }
     }
   }
   javascript.append(");");
   web_contents_->GetMainFrame()->ExecuteJavaScript(
       base::UTF8ToUTF16(javascript));
 }
 
 void DevToolsUIBindings::DocumentAvailableInMainFrame() {
-  if (!reattaching_)
+  if (!reloading_)
     return;
-  reattaching_ = false;
+  reloading_ = false;
   agent_host_->DetachClient(this);
   agent_host_->AttachClient(this);
 }
 
 void DevToolsUIBindings::DocumentOnLoadCompletedInMainFrame() {
   // In the DEBUG_DEVTOOLS mode, the DocumentOnLoadCompletedInMainFrame event
   // arrives before the LoadCompleted event, thus it should not trigger the
   // frontend load handling.
 #if !defined(DEBUG_DEVTOOLS)
   FrontendLoaded();
 #endif
 }
 
 void DevToolsUIBindings::DidNavigateMainFrame() {
   frontend_loaded_ = false;
 }
 
 void DevToolsUIBindings::FrontendLoaded() {
   if (frontend_loaded_)
     return;
   frontend_loaded_ = true;
 
   // Call delegate first - it seeds importants bit of information.
   delegate_->OnLoadCompleted();
 
   AddDevToolsExtensionsToClient();
 }