DevTools: merge devtools target with devtools host, part 1

content/browser/devtools/devtools_agent_host_impl.cc

 // Copyright (c) 2012 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/devtools/devtools_agent_host_impl.h"
 
 #include <map>
 #include <vector>
 
 #include "base/guid.h"
@@ skipping 14 matching lines @@
 namespace {
 typedef std::map<std::string, DevToolsAgentHostImpl*> Instances;
 base::LazyInstance<Instances>::Leaky g_instances = LAZY_INSTANCE_INITIALIZER;
 
 typedef std::vector<const DevToolsAgentHost::AgentStateCallback*>
     AgentStateCallbacks;
 base::LazyInstance<AgentStateCallbacks>::Leaky g_callbacks =
     LAZY_INSTANCE_INITIALIZER;
 }  // namespace
 
+char DevToolsAgentHost::kTypePage[] = "page";
+char DevToolsAgentHost::kTypeFrame[] = "frame";
+char DevToolsAgentHost::kTypeSharedWorker[] = "shared_worker";
+char DevToolsAgentHost::kTypeServiceWorker[] = "service_worker";
+char DevToolsAgentHost::kTypeExternal[] = "external";
+char DevToolsAgentHost::kTypeBrowser[] = "browser";
+char DevToolsAgentHost::kTypeOther[] = "other";
+
 // static
 std::string DevToolsAgentHost::GetProtocolVersion() {
   return std::string(devtools::kProtocolVersion);
 }
 
 // static
 bool DevToolsAgentHost::IsSupportedProtocolVersion(const std::string& version) {
   return devtools::IsSupportedProtocolVersion(version);
 }
 
@@ skipping 114 matching lines @@
     int y) {
  if (!client_ || client_ != client)
    return;
  InspectElement(x, y);
 }
 
 std::string DevToolsAgentHostImpl::GetId() {
   return id_;
 }
 
+std::string DevToolsAgentHostImpl::GetParentId() {
+  return "";
+}
+
+std::string DevToolsAgentHostImpl::GetDescription() {
+  return "";
+}
+
+GURL DevToolsAgentHostImpl::GetFaviconURL() {
+  return GURL();
+}
+
+base::TimeTicks DevToolsAgentHostImpl::GetLastActivityTime() {
+  return base::TimeTicks();
+}
+
 BrowserContext* DevToolsAgentHostImpl::GetBrowserContext() {
   return nullptr;
 }
 
 WebContents* DevToolsAgentHostImpl::GetWebContents() {
   return NULL;
 }
 
 void DevToolsAgentHostImpl::DisconnectWebContents() {
 }
 
 void DevToolsAgentHostImpl::ConnectWebContents(WebContents* wc) {
 }
 
+void DevToolsAgentHostImpl::Inspect() {
+  DevToolsManager* manager = DevToolsManager::GetInstance();
+  manager->delegate()->Inspect(this);
+}
+
 void DevToolsAgentHostImpl::SendProtocolResponse(int session_id,
                                                  const std::string& message) {
   SendMessageToClient(session_id, message);
 }
 
 void DevToolsAgentHostImpl::SendProtocolNotification(
     const std::string& message) {
   SendMessageToClient(session_id_, message);
 }
 
@@ skipping 66 matching lines @@
     DevToolsAgentHostImpl* agent_host, bool attached) {
   AgentStateCallbacks copy(g_callbacks.Get());
   DevToolsManager* manager = DevToolsManager::GetInstance();
   manager->AgentHostStateChanged(agent_host, attached);
   if (manager->delegate())
     manager->delegate()->DevToolsAgentStateChanged(agent_host, attached);
   for (AgentStateCallbacks::iterator it = copy.begin(); it != copy.end(); ++it)
      (*it)->Run(agent_host, attached);
 }
 
 bool DevToolsAgentHostImpl::Inspect(BrowserContext* browser_context) {

[dgozman, 2016/08/22 23:09:07]

Remove this method.

   DevToolsManager* manager = DevToolsManager::GetInstance();
   if (manager->delegate()) {
-    manager->delegate()->Inspect(browser_context, this);
+    manager->delegate()->Inspect(this);
     return true;
   }
   return false;
 }
 
 // DevToolsMessageChunkProcessor -----------------------------------------------
 
 DevToolsMessageChunkProcessor::DevToolsMessageChunkProcessor(
     const SendMessageCallback& callback)
     : callback_(callback),
@@ skipping 32 matching lines @@
     if (message_buffer_.size() != message_buffer_size_)
       return false;
     callback_.Run(chunk.session_id, message_buffer_);
     message_buffer_ = std::string();
     message_buffer_size_ = 0;
   }
   return true;
 }
 
 }  // namespace content