diff options
author | vkuzkokov <vkuzkokov@chromium.org> | 2014-11-20 08:13:25 -0800 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2014-11-20 16:13:54 +0000 |
commit | 9c9d7fc86495c3482a3e0e4a088501ec5ad7dfa0 (patch) | |
tree | 967bd29abd3e8d9fe2abf9b4250ee8c70a11d688 /content/browser/devtools/devtools_http_handler_impl.cc | |
parent | 4c60e323e1bafaed53f74419be2a6422e8bbc830 (diff) | |
download | chromium_src-9c9d7fc86495c3482a3e0e4a088501ec5ad7dfa0.zip chromium_src-9c9d7fc86495c3482a3e0e4a088501ec5ad7dfa0.tar.gz chromium_src-9c9d7fc86495c3482a3e0e4a088501ec5ad7dfa0.tar.bz2 |
[DevTools] Used generated Inspector.detached in DevToolsHttpHandlerImpl
BUG=405566
Review URL: https://codereview.chromium.org/733443003
Cr-Commit-Position: refs/heads/master@{#305018}
Diffstat (limited to 'content/browser/devtools/devtools_http_handler_impl.cc')
-rw-r--r-- | content/browser/devtools/devtools_http_handler_impl.cc | 25 |
1 files changed, 9 insertions, 16 deletions
diff --git a/content/browser/devtools/devtools_http_handler_impl.cc b/content/browser/devtools/devtools_http_handler_impl.cc index 6b3da59a..c5d4076 100644 --- a/content/browser/devtools/devtools_http_handler_impl.cc +++ b/content/browser/devtools/devtools_http_handler_impl.cc @@ -349,23 +349,16 @@ class DevToolsAgentHostClientImpl : public DevToolsAgentHostClient { void AgentHostClosed(DevToolsAgentHost* agent_host, bool replaced_with_another_client) override { DCHECK(agent_host == agent_host_.get()); - agent_host_ = NULL; - - base::DictionaryValue notification; - notification.SetString( - devtools::Inspector::detached::kParamReason, - replaced_with_another_client ? - "replaced_with_devtools" : "target_closed"); - std::string response = DevToolsProtocol::CreateNotification( - devtools::Inspector::detached::kName, - notification.DeepCopy())->Serialize(); - message_loop_->PostTask( - FROM_HERE, - base::Bind(&ServerWrapper::SendOverWebSocket, - base::Unretained(server_wrapper_), - connection_id_, - response)); + base::Callback<void(const std::string&)> raw_message_callback( + base::Bind(&DevToolsAgentHostClientImpl::DispatchProtocolMessage, + base::Unretained(this), base::Unretained(agent_host))); + devtools::inspector::Client inspector(raw_message_callback); + inspector.Detached(devtools::inspector::DetachedParams::Create() + ->set_reason(replaced_with_another_client ? + "replaced_with_devtools" : "target_closed")); + + agent_host_ = nullptr; message_loop_->PostTask( FROM_HERE, base::Bind(&ServerWrapper::Close, |