content/browser/devtools/embedded_worker_devtools_agent_host.cc - Issue 467653002: Revert of [DevTools] Make DevTools clients talk directly to DevToolsAgentHost instead of using DevToolsManage…

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: content/browser/devtools/embedded_worker_devtools_agent_host.cc

Issue 467653002: Revert of [DevTools] Make DevTools clients talk directly to DevToolsAgentHost instead of using DevToolsManage… (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 6 years, 4 months 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

« no previous file with comments | « content/browser/devtools/devtools_manager_unittest.cc ('k') | content/browser/devtools/embedded_worker_devtools_manager.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 8a7a9482213b34e76fdcc9029dae550cf00cce6b..9f604001134b61ba4a11c8e40974e723e8b516e5 100644

--- a/content/browser/devtools/embedded_worker_devtools_agent_host.cc

+++ b/content/browser/devtools/embedded_worker_devtools_agent_host.cc

@@ -83,7 +83,7 @@

void EmbeddedWorkerDevToolsAgentHost::WorkerContextStarted() {

if (state_ == WORKER_PAUSED_FOR_DEBUG_ON_START) {

RenderProcessHost* rph = RenderProcessHost::FromID(worker_id_.first);

- Inspect(rph->GetBrowserContext());

+ DevToolsManagerImpl::GetInstance()->Inspect(rph->GetBrowserContext(), this);

} else if (state_ == WORKER_PAUSED_FOR_REATTACH) {

DCHECK(IsAttached());

state_ = WORKER_INSPECTED;

@@ -107,7 +107,8 @@

std::string notification =

DevToolsProtocol::CreateNotification(

devtools::Worker::disconnectedFromWorker::kName, NULL)->Serialize();

- SendMessageToClient(notification);

+ DevToolsManagerImpl::GetInstance()->DispatchOnInspectorFrontend(

+ this, notification);

DetachFromWorker();

}

state_ = WORKER_TERMINATED;

@@ -146,7 +147,8 @@

void EmbeddedWorkerDevToolsAgentHost::OnDispatchOnInspectorFrontend(

const std::string& message) {

- SendMessageToClient(message);

+ DevToolsManagerImpl::GetInstance()->DispatchOnInspectorFrontend(

+ this, message);

}

void EmbeddedWorkerDevToolsAgentHost::OnSaveAgentRuntimeState(