Index: content/browser/debugger/render_view_devtools_agent_host.cc |
diff --git a/content/browser/debugger/render_view_devtools_agent_host.cc b/content/browser/debugger/render_view_devtools_agent_host.cc |
index 53467b2aadce1b93bf305ceb8d831d91547e284d..7da63f427135451602d3dd529a4850ca8895123c 100644 |
--- a/content/browser/debugger/render_view_devtools_agent_host.cc |
+++ b/content/browser/debugger/render_view_devtools_agent_host.cc |
@@ -6,17 +6,20 @@ |
#include "base/basictypes.h" |
#include "base/lazy_instance.h" |
-#include "content/browser/debugger/devtools_manager.h" |
+#include "content/browser/debugger/devtools_manager_impl.h" |
#include "content/browser/debugger/render_view_devtools_agent_host.h" |
#include "content/browser/renderer_host/render_process_host_impl.h" |
#include "content/browser/renderer_host/render_view_host.h" |
#include "content/browser/site_instance.h" |
#include "content/browser/tab_contents/tab_contents.h" |
#include "content/common/devtools_messages.h" |
+#include "content/public/browser/devtools/devtools_agent_host_registry.h" |
#include "content/public/browser/content_browser_client.h" |
#include "content/public/browser/notification_service.h" |
#include "content/public/browser/notification_types.h" |
+namespace content { |
+ |
typedef std::map<RenderViewHost*, RenderViewDevToolsAgentHost*> Instances; |
namespace { |
@@ -25,7 +28,9 @@ base::LazyInstance<Instances, |
g_instances = LAZY_INSTANCE_INITIALIZER; |
} // namespace |
-DevToolsAgentHost* RenderViewDevToolsAgentHost::FindFor( |
+ |
+// static |
+DevToolsAgentHost* DevToolsAgentHostRegistry::GetDevToolsAgentHost( |
RenderViewHost* rvh) { |
Instances::iterator it = g_instances.Get().find(rvh); |
if (it != g_instances.Get().end()) |
@@ -33,8 +38,17 @@ DevToolsAgentHost* RenderViewDevToolsAgentHost::FindFor( |
return new RenderViewDevToolsAgentHost(rvh); |
} |
-bool RenderViewDevToolsAgentHost::IsDebuggerAttached( |
- TabContents* tab_contents) { |
+// static |
+bool DevToolsAgentHostRegistry::HasDevToolsAgentHost(RenderViewHost* rvh) { |
+ if (g_instances == NULL) |
+ return false; |
+ Instances::iterator it = g_instances.Get().find(rvh); |
+ return it != g_instances.Get().end(); |
+} |
+ |
+bool DevToolsAgentHostRegistry::IsDebuggerAttached(TabContents* tab_contents) { |
+ if (g_instances == NULL) |
+ return false; |
DevToolsManager* devtools_manager = DevToolsManager::GetInstance(); |
if (!devtools_manager) |
return false; |
@@ -99,12 +113,12 @@ bool RenderViewDevToolsAgentHost::OnMessageReceived( |
void RenderViewDevToolsAgentHost::OnSaveAgentRuntimeState( |
const std::string& state) { |
- DevToolsManager::GetInstance()->SaveAgentRuntimeState(this, state); |
+ DevToolsManagerImpl::GetInstance()->SaveAgentRuntimeState(this, state); |
} |
void RenderViewDevToolsAgentHost::OnForwardToClient( |
const IPC::Message& message) { |
- DevToolsManager::GetInstance()->ForwardToDevToolsClient( |
+ DevToolsManagerImpl::GetInstance()->ForwardToDevToolsClient( |
this, message); |
} |
@@ -116,3 +130,5 @@ void RenderViewDevToolsAgentHost::OnClearBrowserCookies() { |
content::GetContentClient()->browser()->ClearCookies(render_view_host_); |
} |
+} // namespace content |
+ |