Index: content/browser/devtools/embedded_worker_devtools_agent_host.cc |
diff --git a/content/browser/devtools/embedded_worker_devtools_agent_host.cc b/content/browser/devtools/embedded_worker_devtools_agent_host.cc |
index 19c873574a0f94efe2e7f8357dcaec7af98e59ab..a0cffd843e017393ea4374f4c6b34d515f637ef2 100644 |
--- a/content/browser/devtools/embedded_worker_devtools_agent_host.cc |
+++ b/content/browser/devtools/embedded_worker_devtools_agent_host.cc |
@@ -4,6 +4,7 @@ |
#include "content/browser/devtools/embedded_worker_devtools_agent_host.h" |
+#include "base/strings/utf_string_conversions.h" |
#include "content/browser/devtools/devtools_manager_impl.h" |
#include "content/browser/devtools/devtools_protocol.h" |
#include "content/browser/devtools/devtools_protocol_constants.h" |
@@ -63,6 +64,15 @@ bool EmbeddedWorkerDevToolsAgentHost::IsWorker() const { |
return true; |
} |
+DevToolsAgentHost::Type EmbeddedWorkerDevToolsAgentHost::GetType() { |
+ return shared_worker_ ? AGENT_HOST_SHARED_WORKER |
+ : AGENT_HOST_SERVICE_WORKER; |
+} |
+ |
+std::string EmbeddedWorkerDevToolsAgentHost::GetTitle() { |
+ return shared_worker_ ? base::UTF16ToUTF8(shared_worker_->name()) : ""; |
+} |
+ |
GURL EmbeddedWorkerDevToolsAgentHost::GetURL() { |
if (shared_worker_) |
return shared_worker_->url(); |
@@ -71,6 +81,10 @@ GURL EmbeddedWorkerDevToolsAgentHost::GetURL() { |
return GURL(); |
} |
+bool EmbeddedWorkerDevToolsAgentHost::Activate() { |
+ return false; |
+} |
+ |
bool EmbeddedWorkerDevToolsAgentHost::Close() { |
if (shared_worker_) { |
BrowserThread::PostTask(BrowserThread::IO, FROM_HERE, |
@@ -157,6 +171,7 @@ void EmbeddedWorkerDevToolsAgentHost::WorkerDestroyed() { |
DevToolsProtocol::CreateNotification( |
devtools::Worker::disconnectedFromWorker::kName, NULL)->Serialize(); |
SendMessageToClient(notification); |
+ HostClosed(); |
dgozman
2014/08/22 08:38:28
This should go to a separate patch.
vkuzkokov
2014/08/22 11:01:48
Done.
|
DetachFromWorker(); |
} |
state_ = WORKER_TERMINATED; |
@@ -173,6 +188,10 @@ bool EmbeddedWorkerDevToolsAgentHost::Matches( |
return service_worker_ && service_worker_->Matches(other); |
} |
+bool EmbeddedWorkerDevToolsAgentHost::IsTerminated() { |
+ return state_ == WORKER_TERMINATED; |
+} |
+ |
EmbeddedWorkerDevToolsAgentHost::~EmbeddedWorkerDevToolsAgentHost() { |
DCHECK_EQ(WORKER_TERMINATED, state_); |
EmbeddedWorkerDevToolsManager::GetInstance()->RemoveInspectedWorkerData( |