Index: content/browser/devtools/worker_devtools_manager.cc |
diff --git a/content/browser/devtools/worker_devtools_manager.cc b/content/browser/devtools/worker_devtools_manager.cc |
index f0608815f3336c782f1100577a01c16ff2298d07..7202d7eac79faf3a86a44d1b9b00c5f1e5520a2d 100644 |
--- a/content/browser/devtools/worker_devtools_manager.cc |
+++ b/content/browser/devtools/worker_devtools_manager.cc |
@@ -13,6 +13,7 @@ |
#include "content/browser/devtools/devtools_protocol.h" |
#include "content/browser/devtools/devtools_protocol_constants.h" |
#include "content/browser/devtools/ipc_devtools_agent_host.h" |
+#include "content/browser/devtools/shared_worker_devtools_manager.h" |
#include "content/browser/devtools/worker_devtools_message_filter.h" |
#include "content/browser/worker_host/worker_service_impl.h" |
#include "content/common/devtools_messages.h" |
@@ -27,9 +28,13 @@ namespace content { |
scoped_refptr<DevToolsAgentHost> DevToolsAgentHost::GetForWorker( |
int worker_process_id, |
int worker_route_id) { |
- return WorkerDevToolsManager::GetDevToolsAgentHostForWorker( |
- worker_process_id, |
- worker_route_id); |
+ if (WorkerService::EmbeddedSharedWorkerEnabled()) { |
+ return SharedWorkerDevToolsManager::GetDevToolsAgentHostForWorker( |
+ worker_process_id, worker_route_id); |
+ } else { |
+ return WorkerDevToolsManager::GetDevToolsAgentHostForWorker( |
+ worker_process_id, worker_route_id); |
+ } |
} |
// Called on the UI thread. |
@@ -37,9 +42,13 @@ scoped_refptr<DevToolsAgentHost> DevToolsAgentHost::GetForWorker( |
bool DevToolsAgentHost::HasForWorker( |
int worker_process_id, |
int worker_route_id) { |
- return WorkerDevToolsManager::HasDevToolsAgentHostForWorker( |
- worker_process_id, |
- worker_route_id); |
+ if (WorkerService::EmbeddedSharedWorkerEnabled()) { |
+ return SharedWorkerDevToolsManager::HasDevToolsAgentHostForWorker( |
+ worker_process_id, worker_route_id); |
+ } else { |
+ return WorkerDevToolsManager::HasDevToolsAgentHostForWorker( |
+ worker_process_id, worker_route_id); |
+ } |
} |
namespace { |
@@ -217,6 +226,7 @@ struct WorkerDevToolsManager::InspectedWorker { |
// static |
WorkerDevToolsManager* WorkerDevToolsManager::GetInstance() { |
+ DCHECK(!WorkerService::EmbeddedSharedWorkerEnabled()); |
DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); |
return Singleton<WorkerDevToolsManager>::get(); |
} |
@@ -225,6 +235,7 @@ WorkerDevToolsManager* WorkerDevToolsManager::GetInstance() { |
DevToolsAgentHost* WorkerDevToolsManager::GetDevToolsAgentHostForWorker( |
int worker_process_id, |
int worker_route_id) { |
+ DCHECK(!WorkerService::EmbeddedSharedWorkerEnabled()); |
WorkerId id(worker_process_id, worker_route_id); |
AgentHosts::iterator it = g_agent_map.Get().find(id); |
if (it == g_agent_map.Get().end()) |
@@ -236,6 +247,7 @@ DevToolsAgentHost* WorkerDevToolsManager::GetDevToolsAgentHostForWorker( |
bool WorkerDevToolsManager::HasDevToolsAgentHostForWorker( |
int worker_process_id, |
int worker_route_id) { |
+ DCHECK(!WorkerService::EmbeddedSharedWorkerEnabled()); |
WorkerId id(worker_process_id, worker_route_id); |
return g_agent_map.Get().find(id) != g_agent_map.Get().end(); |
} |