| 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..e44c3b90a2bef2f2bae0475c24a0566417bb691f 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,14 @@ bool EmbeddedWorkerDevToolsAgentHost::IsWorker() const {
|
| return true;
|
| }
|
|
|
| +std::string EmbeddedWorkerDevToolsAgentHost::GetType() {
|
| + return shared_worker_ ? kTypeWorker : kTypeServiceWorker;
|
| +}
|
| +
|
| +std::string EmbeddedWorkerDevToolsAgentHost::GetTitle() {
|
| + return shared_worker_ ? base::UTF16ToUTF8(shared_worker_->name()) : "";
|
| +}
|
| +
|
| GURL EmbeddedWorkerDevToolsAgentHost::GetURL() {
|
| if (shared_worker_)
|
| return shared_worker_->url();
|
| @@ -71,6 +80,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 +170,7 @@ void EmbeddedWorkerDevToolsAgentHost::WorkerDestroyed() {
|
| DevToolsProtocol::CreateNotification(
|
| devtools::Worker::disconnectedFromWorker::kName, NULL)->Serialize();
|
| SendMessageToClient(notification);
|
| + HostClosed();
|
| DetachFromWorker();
|
| }
|
| state_ = WORKER_TERMINATED;
|
| @@ -173,6 +187,10 @@ bool EmbeddedWorkerDevToolsAgentHost::Matches(
|
| return service_worker_ && service_worker_->Matches(other);
|
| }
|
|
|
| +bool EmbeddedWorkerDevToolsAgentHost::IsAlive() {
|
| + return state_ != WORKER_TERMINATED;
|
| +}
|
| +
|
| EmbeddedWorkerDevToolsAgentHost::~EmbeddedWorkerDevToolsAgentHost() {
|
| DCHECK_EQ(WORKER_TERMINATED, state_);
|
| EmbeddedWorkerDevToolsManager::GetInstance()->RemoveInspectedWorkerData(
|
|
|