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 d58d168bd6fc5ddfbc417ec70b4656b59e2124f6..a87cf4d947c9a67a268c994136ecfeade05fae30 100644 |
--- a/content/browser/devtools/render_view_devtools_agent_host.cc |
+++ b/content/browser/devtools/render_view_devtools_agent_host.cc |
@@ -92,9 +92,6 @@ bool DevToolsAgentHost::HasFor(RenderViewHost* rvh) { |
bool DevToolsAgentHost::IsDebuggerAttached(WebContents* web_contents) { |
if (g_instances == NULL) |
return false; |
- DevToolsManager* devtools_manager = DevToolsManager::GetInstance(); |
- if (!devtools_manager) |
- return false; |
RenderViewHostDelegate* delegate = |
static_cast<WebContentsImpl*>(web_contents); |
for (Instances::iterator it = g_instances.Get().begin(); |
@@ -235,8 +232,6 @@ void RenderViewDevToolsAgentHost::OnClientAttached() { |
// TODO(kaznacheev): Move this call back to DevToolsManagerImpl when |
// extensions::ProcessManager no longer relies on this notification. |
- if (!reattaching_) |
- DevToolsManagerImpl::GetInstance()->NotifyObservers(this, true); |
} |
void RenderViewDevToolsAgentHost::InnerOnClientAttached() { |
@@ -274,8 +269,6 @@ void RenderViewDevToolsAgentHost::ClientDetachedFromRenderer() { |
// TODO(kaznacheev): Move this call back to DevToolsManagerImpl when |
// extensions::ProcessManager no longer relies on this notification. |
- if (!reattaching_) |
- DevToolsManagerImpl::GetInstance()->NotifyObservers(this, false); |
} |
void RenderViewDevToolsAgentHost::InnerClientDetachedFromRenderer() { |
@@ -342,7 +335,7 @@ void RenderViewDevToolsAgentHost::RenderViewDeleted(RenderViewHost* rvh) { |
DCHECK(render_view_host_); |
scoped_refptr<RenderViewDevToolsAgentHost> protect(this); |
- NotifyCloseListener(); |
+ HostClosed(); |
ClearRenderViewHost(); |
Release(); |
} |
@@ -422,8 +415,7 @@ void RenderViewDevToolsAgentHost::RenderViewCrashed() { |
scoped_refptr<DevToolsProtocol::Notification> notification = |
DevToolsProtocol::CreateNotification( |
devtools::Inspector::targetCrashed::kName, NULL); |
- DevToolsManagerImpl::GetInstance()-> |
- DispatchOnInspectorFrontend(this, notification->Serialize()); |
+ SendMessageToClient(notification->Serialize()); |
} |
bool RenderViewDevToolsAgentHost::DispatchIPCMessage( |
@@ -484,8 +476,7 @@ void RenderViewDevToolsAgentHost::OnDispatchOnInspectorFrontend( |
if (notification) { |
tracing_handler_->HandleNotification(notification); |
} |
- DevToolsManagerImpl::GetInstance()->DispatchOnInspectorFrontend( |
- this, message); |
+ SendMessageToClient(message); |
} |
} // namespace content |