Define DevTools content API

chrome/browser/extensions/extension_debugger_api.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.
 
 // Implements the Chrome Extensions Debugger API.
 
 #include "chrome/browser/extensions/extension_debugger_api.h"
 
 #include <map>
 #include <set>
 
 #include "base/json/json_reader.h"
 #include "base/json/json_writer.h"
 #include "base/memory/singleton.h"
 #include "base/string_number_conversions.h"
 #include "base/values.h"
 #include "chrome/browser/extensions/extension_debugger_api_constants.h"
 #include "chrome/browser/extensions/extension_event_router.h"
 #include "chrome/browser/extensions/extension_tab_util.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/extensions/extension_error_utils.h"
-#include "content/browser/debugger/devtools_client_host.h"
-#include "content/browser/debugger/devtools_manager.h"
+#include "content/public/browser/devtools/devtools_agent_host_registry.h"
+#include "content/public/browser/devtools/devtools_client_host.h"
+#include "content/public/browser/devtools/devtools_manager.h"
 #include "content/browser/tab_contents/tab_contents.h"
 #include "content/common/devtools_messages.h"
 #include "content/public/browser/notification_source.h"
 #include "webkit/glue/webkit_glue.h"
 
+using content::DevToolsAgentHost;
+using content::DevToolsAgentHostRegistry;
+using content::DevToolsClientHost;
+using content::DevToolsManager;
+
 namespace keys = extension_debugger_api_constants;
 
 class ExtensionDevToolsClientHost : public DevToolsClientHost,
                                     public content::NotificationObserver {
  public:
   ExtensionDevToolsClientHost(TabContents* tab_contents,
                               const std::string& extension_id,
                               int tab_id);
 
   ~ExtensionDevToolsClientHost();
@@ skipping 49 matching lines @@
 
   void Add(ExtensionDevToolsClientHost* client_host) {
     client_hosts_.insert(client_host);
   }
 
   void Remove(ExtensionDevToolsClientHost* client_host) {
     client_hosts_.erase(client_host);
   }
 
   ExtensionDevToolsClientHost* Lookup(RenderViewHost* rvh) {
+    if (!DevToolsAgentHostRegistry::HasDevToolsAgentHost(rvh))
+      return NULL;
+    DevToolsAgentHost* agent =
+        DevToolsAgentHostRegistry::GetDevToolsAgentHost(rvh);
     DevToolsClientHost* client_host =
-        DevToolsManager::GetInstance()->GetDevToolsClientHostFor(rvh);
+        DevToolsManager::GetInstance()->GetDevToolsClientHostFor(agent);
     std::set<DevToolsClientHost*>::iterator it =
         client_hosts_.find(client_host);
     if (it == client_hosts_.end())
       return NULL;
     return static_cast<ExtensionDevToolsClientHost*>(client_host);
   }
 
  private:
   std::set<DevToolsClientHost*> client_hosts_;
 };
@@ skipping 10 matching lines @@
       last_request_id_(0) {
   AttachedClientHosts::GetInstance()->Add(this);
 
   // Detach from debugger when extension unloads.
   Profile* profile =
       Profile::FromBrowserContext(tab_contents_->browser_context());
   registrar_.Add(this, chrome::NOTIFICATION_EXTENSION_UNLOADED,
                  content::Source<Profile>(profile));
 
   // Attach to debugger and tell it we are ready.
-  DevToolsManager::GetInstance()->RegisterDevToolsClientHostFor(
-      tab_contents_->render_view_host(),
-      this);
+  DevToolsAgentHost* agent = DevToolsAgentHostRegistry::GetDevToolsAgentHost(
+      tab_contents_->render_view_host());
+  DevToolsManager::GetInstance()->RegisterDevToolsClientHostFor(agent, this);
   DevToolsManager::GetInstance()->ForwardToDevToolsAgent(
       this,
       DevToolsAgentMsg_FrontendLoaded(MSG_ROUTING_NONE));
 }
 
 ExtensionDevToolsClientHost::~ExtensionDevToolsClientHost() {
   AttachedClientHosts::GetInstance()->Remove(this);
 }
 
 bool ExtensionDevToolsClientHost::MatchesContentsAndExtensionId(
@@ skipping 164 matching lines @@
   std::string version;
   EXTENSION_FUNCTION_VALIDATE(args_->GetString(1, &version));
 
   if (!webkit_glue::IsInspectorProtocolVersionSupported(version)) {
     error_ = ExtensionErrorUtils::FormatErrorMessage(
         keys::kProtocolVersionNotSupportedError,
         version);
     return false;
   }
 
+  DevToolsAgentHost* agent = DevToolsAgentHostRegistry::GetDevToolsAgentHost(
+      contents_->render_view_host());
   DevToolsClientHost* client_host = DevToolsManager::GetInstance()->
-      GetDevToolsClientHostFor(contents_->render_view_host());
+      GetDevToolsClientHostFor(agent);
 
   if (client_host != NULL) {
     error_ = ExtensionErrorUtils::FormatErrorMessage(
         keys::kAlreadyAttachedError,
         base::IntToString(tab_id_));
     return false;
   }
 
   new ExtensionDevToolsClientHost(contents_, GetExtension()->id(), tab_id_);
   SendResponse(true);
@@ skipping 42 matching lines @@
     return;
   }
 
   Value* result_body;
   if (dictionary->Get("result", &result_body))
     result_.reset(result_body->DeepCopy());
   else
     result_.reset(new DictionaryValue());
   SendResponse(true);
 }