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

Unified Diff: content/browser/devtools/render_view_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
Index: content/browser/devtools/render_view_devtools_agent_host.cc
diff --git a/content/browser/devtools/render_view_devtools_agent_host.cc b/content/browser/devtools/render_view_devtools_agent_host.cc
index b16c2dce27992fee5cb78f8481dec6fb40f1a337..f0c9c8fd3542e08ce0cdcacc1abddf84faa89e35 100644
--- a/content/browser/devtools/render_view_devtools_agent_host.cc
+++ b/content/browser/devtools/render_view_devtools_agent_host.cc
@@ -127,7 +127,7 @@
return web_contents();
}
-void RenderViewDevToolsAgentHost::DispatchProtocolMessage(
+void RenderViewDevToolsAgentHost::DispatchOnInspectorBackend(
const std::string& message) {
std::string error_message;
@@ -161,7 +161,7 @@
}
}
- IPCDevToolsAgentHost::DispatchProtocolMessage(message);
+ IPCDevToolsAgentHost::DispatchOnInspectorBackend(message);
}
void RenderViewDevToolsAgentHost::SendMessageToAgent(IPC::Message* msg) {
@@ -180,7 +180,7 @@
// TODO(kaznacheev): Move this call back to DevToolsManagerImpl when
// extensions::ProcessManager no longer relies on this notification.
if (!reattaching_)
- DevToolsAgentHostImpl::NotifyCallbacks(this, true);
+ DevToolsManagerImpl::GetInstance()->NotifyObservers(this, true);
}
void RenderViewDevToolsAgentHost::InnerOnClientAttached() {
@@ -212,7 +212,7 @@
// TODO(kaznacheev): Move this call back to DevToolsManagerImpl when
// extensions::ProcessManager no longer relies on this notification.
if (!reattaching_)
- DevToolsAgentHostImpl::NotifyCallbacks(this, false);
+ DevToolsManagerImpl::GetInstance()->NotifyObservers(this, false);
}
void RenderViewDevToolsAgentHost::ClientDetachedFromRenderer() {
@@ -286,7 +286,7 @@
DCHECK(render_view_host_);
scoped_refptr<RenderViewDevToolsAgentHost> protect(this);
- HostClosed();
+ NotifyCloseListener();
ClearRenderViewHost();
Release();
}
@@ -385,7 +385,8 @@
scoped_refptr<DevToolsProtocol::Notification> notification =
DevToolsProtocol::CreateNotification(
devtools::Inspector::targetCrashed::kName, NULL);
- SendMessageToClient(notification->Serialize());
+ DevToolsManagerImpl::GetInstance()->
+ DispatchOnInspectorFrontend(this, notification->Serialize());
}
bool RenderViewDevToolsAgentHost::DispatchIPCMessage(
@@ -446,7 +447,8 @@
if (notification) {
tracing_handler_->HandleNotification(notification);
}
- SendMessageToClient(message);
+ DevToolsManagerImpl::GetInstance()->DispatchOnInspectorFrontend(
+ this, message);
}
} // namespace content

Powered by Google App Engine
This is Rietveld 408576698