Define DevTools content API

content/browser/debugger/devtools_manager_impl.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "content/browser/debugger/devtools_manager.h"
+#include "content/browser/debugger/devtools_manager_impl.h"
 
 #include <vector>
 
 #include "base/bind.h"
 #include "base/message_loop.h"
 #include "content/browser/browsing_instance.h"
 #include "content/browser/child_process_security_policy.h"
-#include "content/browser/debugger/devtools_client_host.h"
 #include "content/browser/debugger/devtools_netlog_observer.h"
 #include "content/browser/debugger/render_view_devtools_agent_host.h"
 #include "content/browser/renderer_host/render_view_host.h"
 #include "content/browser/tab_contents/tab_contents.h"
 #include "content/public/browser/browser_thread.h"
-#include "content/public/browser/content_browser_client.h"
+#include "content/public/browser/devtools/devtools_client_host.h"
+#include "content/public/browser/devtools/devtools_agent_host_registry.h"
+#include "content/public/browser/notification_service.h"
+#include "content/public/browser/notification_types.h"
 #include "googleurl/src/gurl.h"
 
 using content::BrowserThread;
+using content::DevToolsAgentHost;
+using content::DevToolsAgentHostRegistry;

[jam, 2011/11/21 21:16:04]

nit: these using statements aren't needed anymore?

[yurys, 2011/11/30 15:49:43]

Done.

+
+namespace content {
 
 // static
 DevToolsManager* DevToolsManager::GetInstance() {
-  return content::GetContentClient()->browser()->GetDevToolsManager();
+  return DevToolsManagerImpl::GetInstance();
 }
 
-DevToolsManager::DevToolsManager()
-    : last_orphan_cookie_(0) {
+// static
+DevToolsManagerImpl* DevToolsManagerImpl::GetInstance() {
+  return Singleton<DevToolsManagerImpl,
+                   LeakySingletonTraits<DevToolsManagerImpl> >::get();
 }
 
-DevToolsManager::~DevToolsManager() {
+DevToolsManagerImpl::DevToolsManagerImpl()
+    : last_orphan_cookie_(0) {
+  notification_registrar_.Add(this,
+                              content::NOTIFICATION_MAIN_MESSAGE_LOOP_EXITING,
+                              content::NotificationService::AllSources());
+}
+
+DevToolsManagerImpl::~DevToolsManagerImpl() {
   DCHECK(agent_to_client_host_.empty());
   DCHECK(client_to_agent_host_.empty());
   // By the time we destroy devtools manager, all orphan client hosts should
   // have been delelted, no need to notify them upon tab closing.
   DCHECK(orphan_client_hosts_.empty());
 }
 
-DevToolsClientHost* DevToolsManager::GetDevToolsClientHostFor(
-    RenderViewHost* inspected_rvh) {
-  DevToolsAgentHost* agent_host = RenderViewDevToolsAgentHost::FindFor(
-      inspected_rvh);
-  return GetDevToolsClientHostFor(agent_host);
-}
-
-DevToolsClientHost* DevToolsManager::GetDevToolsClientHostFor(
+DevToolsClientHost* DevToolsManagerImpl::GetDevToolsClientHostFor(
     DevToolsAgentHost* agent_host) {
   AgentToClientHostMap::iterator it = agent_to_client_host_.find(agent_host);
   if (it != agent_to_client_host_.end())
     return it->second;
   return NULL;
 }
 
-void DevToolsManager::RegisterDevToolsClientHostFor(
-    RenderViewHost* inspected_rvh,
-    DevToolsClientHost* client_host) {
-  DCHECK(!GetDevToolsClientHostFor(inspected_rvh));
-  DevToolsAgentHost* agent_host = RenderViewDevToolsAgentHost::FindFor(
-      inspected_rvh);
-  RegisterDevToolsClientHostFor(agent_host, client_host);
-}
-
-void DevToolsManager::RegisterDevToolsClientHostFor(
+void DevToolsManagerImpl::RegisterDevToolsClientHostFor(
     DevToolsAgentHost* agent_host,
     DevToolsClientHost* client_host) {
   BindClientHost(agent_host, client_host);
   agent_host->Attach();
   client_host->set_close_listener(this);
 }
 
-bool DevToolsManager::ForwardToDevToolsAgent(DevToolsClientHost* from,
+bool DevToolsManagerImpl::ForwardToDevToolsAgent(DevToolsClientHost* from,
                                              const IPC::Message& message) {
   DevToolsAgentHost* agent_host = GetAgentHost(from);
   if (!agent_host)
     return false;
 
   agent_host->SendMessageToAgent(new IPC::Message(message));
   return true;
 }
 
-void DevToolsManager::ForwardToDevToolsClient(DevToolsAgentHost* agent_host,
+void DevToolsManagerImpl::ForwardToDevToolsClient(DevToolsAgentHost* agent_host,
                                               const IPC::Message& message) {
   DevToolsClientHost* client_host = GetDevToolsClientHostFor(agent_host);
   if (!client_host) {
     // Client window was closed while there were messages
     // being sent to it.
     return;
   }
   client_host->SendMessageToClient(message);
 }
 
-void DevToolsManager::SaveAgentRuntimeState(DevToolsAgentHost* agent_host,
+void DevToolsManagerImpl::SaveAgentRuntimeState(DevToolsAgentHost* agent_host,
                                             const std::string& state) {
   agent_runtime_states_[agent_host] = state;
 }
 
-void DevToolsManager::ClientHostClosing(DevToolsClientHost* client_host) {
+void DevToolsManagerImpl::ClientHostClosing(DevToolsClientHost* client_host) {
   DevToolsAgentHost* agent_host = GetAgentHost(client_host);
   if (!agent_host) {
     // It might be in the list of orphan client hosts, remove it from there.
     for (OrphanClientHosts::iterator it = orphan_client_hosts_.begin();
          it != orphan_client_hosts_.end(); ++it) {
       if (it->second.first == client_host) {
         orphan_client_hosts_.erase(it->first);
         return;
       }
     }
     return;
   }
 
   agent_host->NotifyClientClosing();
 
   UnbindClientHost(agent_host, client_host);
 }
 
-void DevToolsManager::AgentHostClosing(DevToolsAgentHost* agent_host) {
+void DevToolsManagerImpl::AgentHostClosing(DevToolsAgentHost* agent_host) {
   UnregisterDevToolsClientHostFor(agent_host);
 }
 
-DevToolsAgentHost* DevToolsManager::GetAgentHost(
+void DevToolsManagerImpl::Observe(int type,
+                              const content::NotificationSource& source,
+                              const content::NotificationDetails& details) {
+  delete this;

[jam, 2011/11/21 21:16:04]

why do you care about deleting this object at shutdown? in general we're trying
to move to a world where we do as little as possible at shutdown, so that we can
quit as quickly as possible. it doesn't look like the destructor here does
anything important. NOTIFICATION_MAIN_MESSAGE_LOOP_EXITING wouldn't be needed
then.

[yurys, 2011/11/30 15:49:43]

Removed this method and all the stuff related to the notification service here.
It was actually a part of another change and I shouldn't have included it here,
sorry for the confusion.

+}
+
+DevToolsAgentHost* DevToolsManagerImpl::GetAgentHost(
     DevToolsClientHost* client_host) {
   ClientHostToInspectedRvhMap::iterator it =
       client_to_agent_host_.find(client_host);
   if (it != client_to_agent_host_.end())
     return it->second;
   return NULL;
 }
 
-void DevToolsManager::UnregisterDevToolsClientHostFor(
-      RenderViewHost* inspected_rvh) {
-  DevToolsAgentHost* agent_host = RenderViewDevToolsAgentHost::FindFor(
-      inspected_rvh);
-  UnregisterDevToolsClientHostFor(agent_host);
-}
-
-void DevToolsManager::UnregisterDevToolsClientHostFor(
+void DevToolsManagerImpl::UnregisterDevToolsClientHostFor(
     DevToolsAgentHost* agent_host) {
   DevToolsClientHost* client_host = GetDevToolsClientHostFor(agent_host);
   if (!client_host)
     return;
   UnbindClientHost(agent_host, client_host);
   client_host->InspectedTabClosing();
 }
 
-void DevToolsManager::OnNavigatingToPendingEntry(RenderViewHost* rvh,
+void DevToolsManagerImpl::OnNavigatingToPendingEntry(RenderViewHost* rvh,
                                                  RenderViewHost* dest_rvh,
                                                  const GURL& gurl) {
   if (rvh == dest_rvh && rvh->render_view_termination_status() ==
           base::TERMINATION_STATUS_STILL_RUNNING)
     return;
   int cookie = DetachClientHost(rvh);
   if (cookie != -1) {
     // Navigating to URL in the inspected window.
     AttachClientHost(cookie, dest_rvh);
 
-    DevToolsClientHost* client_host = GetDevToolsClientHostFor(dest_rvh);
+    DevToolsAgentHost* dest_agent_host =
+        DevToolsAgentHostRegistry::GetDevToolsAgentHost(dest_rvh);
+    DevToolsClientHost* client_host = GetDevToolsClientHostFor(
+        dest_agent_host);
     client_host->FrameNavigating(gurl.spec());
   }
 }
 
-void DevToolsManager::OnCancelPendingNavigation(RenderViewHost* pending,
+void DevToolsManagerImpl::OnCancelPendingNavigation(RenderViewHost* pending,
                                                 RenderViewHost* current) {
   int cookie = DetachClientHost(pending);
   if (cookie != -1) {
     // Navigating to URL in the inspected window.
     AttachClientHost(cookie, current);
   }
 }
 
-void DevToolsManager::TabReplaced(TabContents* old_tab,
+void DevToolsManagerImpl::TabReplaced(TabContents* old_tab,
                                   TabContents* new_tab) {
   RenderViewHost* old_rvh = old_tab->render_view_host();
-  DevToolsClientHost* client_host = GetDevToolsClientHostFor(old_rvh);
+  if (!DevToolsAgentHostRegistry::HasDevToolsAgentHost(old_rvh))
+    return;
+
+  DevToolsAgentHost* old_agent_host =
+      DevToolsAgentHostRegistry::GetDevToolsAgentHost(old_rvh);
+  DevToolsClientHost* client_host = GetDevToolsClientHostFor(old_agent_host);
   if (!client_host)
     return;  // Didn't know about old_tab.
   int cookie = DetachClientHost(old_rvh);
   if (cookie == -1)
     return;  // Didn't know about old_tab.
 
   client_host->TabReplaced(new_tab);
   AttachClientHost(cookie, new_tab->render_view_host());
 }
 
-int DevToolsManager::DetachClientHost(RenderViewHost* from_rvh) {
-  DevToolsAgentHost* agent_host = RenderViewDevToolsAgentHost::FindFor(
-      from_rvh);
+int DevToolsManagerImpl::DetachClientHost(RenderViewHost* from_rvh) {
+  DevToolsAgentHost* agent_host =
+      DevToolsAgentHostRegistry::GetDevToolsAgentHost(from_rvh);
   return DetachClientHost(agent_host);
 }
 
-int DevToolsManager::DetachClientHost(DevToolsAgentHost* agent_host) {
+int DevToolsManagerImpl::DetachClientHost(DevToolsAgentHost* agent_host) {
   DevToolsClientHost* client_host = GetDevToolsClientHostFor(agent_host);
   if (!client_host)
     return -1;
 
   int cookie = last_orphan_cookie_++;
   orphan_client_hosts_[cookie] =
       std::pair<DevToolsClientHost*, std::string>(
           client_host, agent_runtime_states_[agent_host]);
 
   UnbindClientHost(agent_host, client_host);
   return cookie;
 }
 
-void DevToolsManager::AttachClientHost(int client_host_cookie,
+void DevToolsManagerImpl::AttachClientHost(int client_host_cookie,
                                        RenderViewHost* to_rvh) {
-  DevToolsAgentHost* agent_host = RenderViewDevToolsAgentHost::FindFor(
-      to_rvh);
+  DevToolsAgentHost* agent_host =
+      DevToolsAgentHostRegistry::GetDevToolsAgentHost(to_rvh);
   AttachClientHost(client_host_cookie, agent_host);
 }
 
-void DevToolsManager::AttachClientHost(int client_host_cookie,
+void DevToolsManagerImpl::AttachClientHost(int client_host_cookie,
                                        DevToolsAgentHost* agent_host) {
   OrphanClientHosts::iterator it = orphan_client_hosts_.find(
       client_host_cookie);
   if (it == orphan_client_hosts_.end())
     return;
 
   DevToolsClientHost* client_host = (*it).second.first;
   const std::string& state = (*it).second.second;
   BindClientHost(agent_host, client_host);
   agent_host->Reattach(state);
   agent_runtime_states_[agent_host] = state;
 
   orphan_client_hosts_.erase(it);
 }
 
-void DevToolsManager::BindClientHost(
+void DevToolsManagerImpl::BindClientHost(
     DevToolsAgentHost* agent_host,
     DevToolsClientHost* client_host) {
   DCHECK(agent_to_client_host_.find(agent_host) ==
       agent_to_client_host_.end());
   DCHECK(client_to_agent_host_.find(client_host) ==
       client_to_agent_host_.end());
 
   if (client_to_agent_host_.empty()) {
     BrowserThread::PostTask(
         BrowserThread::IO,
         FROM_HERE,
         base::Bind(&DevToolsNetLogObserver::Attach));
   }
   agent_to_client_host_[agent_host] = client_host;
   client_to_agent_host_[client_host] = agent_host;
   agent_host->set_close_listener(this);
 
   int process_id = agent_host->GetRenderProcessId();
   if (process_id != -1)
     ChildProcessSecurityPolicy::GetInstance()->GrantReadRawCookies(process_id);
 }
 
-void DevToolsManager::UnbindClientHost(DevToolsAgentHost* agent_host,
+void DevToolsManagerImpl::UnbindClientHost(DevToolsAgentHost* agent_host,
                                        DevToolsClientHost* client_host) {
   DCHECK(agent_host);
   DCHECK(agent_to_client_host_.find(agent_host)->second ==
       client_host);
   DCHECK(client_to_agent_host_.find(client_host)->second ==
       agent_host);
   agent_host->set_close_listener(NULL);
 
   agent_to_client_host_.erase(agent_host);
   client_to_agent_host_.erase(client_host);
@@ skipping 13 matching lines @@
   for (AgentToClientHostMap::iterator it = agent_to_client_host_.begin();
        it != agent_to_client_host_.end();
        ++it) {
     if (it->first->GetRenderProcessId() == process_id)
       return;
   }
   // We've disconnected from the last renderer -> revoke cookie permissions.
   ChildProcessSecurityPolicy::GetInstance()->RevokeReadRawCookies(process_id);
 }
 
-void DevToolsManager::CloseAllClientHosts() {
+void DevToolsManagerImpl::CloseAllClientHosts() {
   std::vector<DevToolsAgentHost*> agents;
   for (AgentToClientHostMap::iterator it =
            agent_to_client_host_.begin();
        it != agent_to_client_host_.end(); ++it) {
     agents.push_back(it->first);
   }
   for (std::vector<DevToolsAgentHost*>::iterator it = agents.begin();
        it != agents.end(); ++it) {
     UnregisterDevToolsClientHostFor(*it);
   }
 }
+
+}  // namespace content