Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(336)

Unified Diff: content/browser/debugger/worker_devtools_manager.cc

Issue 8549022: Define DevTools content API (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Comments addressed Created 9 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: content/browser/debugger/worker_devtools_manager.cc
diff --git a/content/browser/debugger/worker_devtools_manager.cc b/content/browser/debugger/worker_devtools_manager.cc
index a2f2f22abfc59f9d48f6fbefff0669cebf36c1cd..4b6c3d9842681fbe6fe4df50efcf38a24022a7f2 100644
--- a/content/browser/debugger/worker_devtools_manager.cc
+++ b/content/browser/debugger/worker_devtools_manager.cc
@@ -9,12 +9,13 @@
#include "base/bind.h"
#include "content/browser/debugger/devtools_agent_host.h"
-#include "content/browser/debugger/devtools_manager.h"
+#include "content/browser/debugger/devtools_manager_impl.h"
#include "content/browser/debugger/worker_devtools_message_filter.h"
#include "content/browser/worker_host/worker_process_host.h"
#include "content/browser/worker_host/worker_service.h"
#include "content/common/devtools_messages.h"
#include "content/public/browser/browser_thread.h"
+#include "content/public/browser/devtools/devtools_agent_host_registry.h"
#include "content/public/browser/notification_observer.h"
#include "content/public/browser/notification_registrar.h"
#include "content/public/browser/notification_service.h"
@@ -25,6 +26,18 @@
using content::BrowserThread;
+namespace content {
+
+// Called on the UI thread.
+// static
+DevToolsAgentHost* DevToolsAgentHostRegistry::GetDevToolsAgentHostForWorker(
+ int worker_process_id,
+ int worker_route_id) {
+ return WorkerDevToolsManager::GetDevToolsAgentHostForWorker(
+ worker_process_id,
+ worker_route_id);
+}
+
class WorkerDevToolsManager::AgentHosts
: private content::NotificationObserver {
public:
@@ -164,10 +177,10 @@ class WorkerDevToolsManager::DetachedClientHosts {
RemovePendingWorkerData(id);
return;
}
- DevToolsManager::GetInstance()->ForwardToDevToolsClient(agent,
+ DevToolsManagerImpl::GetInstance()->ForwardToDevToolsClient(agent,
DevToolsClientMsg_DispatchOnInspectorFrontend(MSG_ROUTING_NONE,
WebKit::WebDevToolsAgent::disconnectEventAsText().utf8()));
- int cookie = DevToolsManager::GetInstance()->DetachClientHost(agent);
+ int cookie = DevToolsManagerImpl::GetInstance()->DetachClientHost(agent);
if (cookie == -1) {
RemovePendingWorkerData(id);
return;
@@ -193,7 +206,7 @@ class WorkerDevToolsManager::DetachedClientHosts {
WorkerDevToolsManager::GetDevToolsAgentHostForWorker(
new_id.first,
new_id.second);
- DevToolsManager::GetInstance()->AttachClientHost(
+ DevToolsManagerImpl::GetInstance()->AttachClientHost(
it->second,
agent);
worker_id_to_cookie_.erase(it);
@@ -436,7 +449,8 @@ void WorkerDevToolsManager::ForwardToDevToolsClientOnUIThread(
worker_route_id));
if (!agent_host)
return;
- DevToolsManager::GetInstance()->ForwardToDevToolsClient(agent_host, message);
+ DevToolsManagerImpl::GetInstance()->ForwardToDevToolsClient(agent_host,
+ message);
}
// static
@@ -449,7 +463,7 @@ void WorkerDevToolsManager::SaveAgentRuntimeStateOnUIThread(
worker_route_id));
if (!agent_host)
return;
- DevToolsManager::GetInstance()->SaveAgentRuntimeState(agent_host, state);
+ DevToolsManagerImpl::GetInstance()->SaveAgentRuntimeState(agent_host, state);
}
// static
@@ -480,3 +494,5 @@ void WorkerDevToolsManager::SendResumeToWorker(const WorkerId& id) {
process->Send(new DevToolsAgentMsg_ResumeWorkerContext(id.second));
}
+} // namespace
+

Powered by Google App Engine
This is Rietveld 408576698