[DevTools] Make DevTools clients talk directly to DevToolsAgentHost instead of using DevToolsManage…

content/public/browser/devtools_agent_host.h

 // 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.
 
 #ifndef CONTENT_PUBLIC_BROWSER_DEVTOOLS_AGENT_HOST_H_
 #define CONTENT_PUBLIC_BROWSER_DEVTOOLS_AGENT_HOST_H_
 
 #include <string>
 #include <vector>
 
 #include "base/basictypes.h"
+#include "base/callback.h"
 #include "base/memory/ref_counted.h"
 #include "content/common/content_export.h"
 
 namespace content {
 
 class DevToolsExternalAgentProxyDelegate;
 class RenderViewHost;
 class WebContents;
 
 // Describes interface for managing devtools agents from browser process.
 class CONTENT_EXPORT DevToolsAgentHost
     : public base::RefCounted<DevToolsAgentHost> {
  public:
+  // Client can attach to the agent host and start inspecting it.
+  class Client {

[jam, 2014/08/08 01:23:28]

nit: move this to a separate header and call it DevToolsAgentHostClient per
http://www.chromium.org/developers/content-module/content-api

[dgozman, 2014/08/08 11:51:55]

Done.

+   public:
+    virtual ~Client() {}
+
+    // Dispatches given protocol message on the client.
+    virtual void DispatchProtocolMessage(DevToolsAgentHost* agent_host,
+                                         const std::string& message) = 0;
+
+    // This method is called when attached agent host is closed.
+    virtual void AgentHostClosed(DevToolsAgentHost* agent_host,
+                                 bool replaced_with_another_client) = 0;
+  };
+
   // Returns DevToolsAgentHost with a given |id| or NULL of it does not exist.
   static scoped_refptr<DevToolsAgentHost> GetForId(const std::string& id);
 
   // Returns DevToolsAgentHost that can be used for inspecting |web_contents|.
   // New DevToolsAgentHost will be created if it does not exist.
   static scoped_refptr<DevToolsAgentHost> GetOrCreateFor(
       WebContents* web_contents);
 
   // Returns DevToolsAgentHost that can be used for inspecting |rvh|.
   // New DevToolsAgentHost will be created if it does not exist.
@@ skipping 12 matching lines @@
   // provided |delegate|. |delegate| ownership is passed to the created agent
   // host.
   static scoped_refptr<DevToolsAgentHost> Create(
       DevToolsExternalAgentProxyDelegate* delegate);
 
   static bool IsDebuggerAttached(WebContents* web_contents);
 
   // Returns a list of all existing RenderViewHost's that can be debugged.
   static std::vector<RenderViewHost*> GetValidRenderViewHosts();
 
+  // Client attaches to this agent host to start debugging it.
+  virtual void AttachClient(Client* client) = 0;
+
+  // Already attached client detaches from this agent host to stop debugging it.
+  virtual void DetachClient() = 0;
+
   // Returns true if there is a client attached.
   virtual bool IsAttached() = 0;
 
+  // Sends a message to the agent.
+  virtual void DispatchOnInspectorBackend(const std::string& message) = 0;

[pfeldman, 2014/08/07 17:31:14]

I wish we could rename it to DispatchProtocolMessage as well.

[dgozman, 2014/08/08 11:51:56]

Done.

+
   // Starts inspecting element at position (|x|, |y|) in the specified page.
   virtual void InspectElement(int x, int y) = 0;
 
   // Returns the unique id of the agent.
   virtual std::string GetId() = 0;
 
   // Returns render view host instance for this host if any.
   virtual RenderViewHost* GetRenderViewHost() = 0;
 
   // Temporarily detaches render view host from this host. Must be followed by
   // a call to ConnectRenderViewHost (may leak the host instance otherwise).
   virtual void DisconnectRenderViewHost() = 0;
 
   // Attaches render view host to this host.
   virtual void ConnectRenderViewHost(RenderViewHost* rvh) = 0;
 
   // Returns true if DevToolsAgentHost is for worker.
   virtual bool IsWorker() const = 0;
 
+  // Terminates all debugging sessions and detaches all clients.
+  static void DetachAllClients();
+
+  typedef base::Callback<void(DevToolsAgentHost*, bool attached)>
+      AgentStateCallback;
+
+  static void AddAgentStateCallback(const AgentStateCallback& callback);
+  static void RemoveAgentStateCallback(const AgentStateCallback& callback);
+
  protected:
   friend class base::RefCounted<DevToolsAgentHost>;
   virtual ~DevToolsAgentHost() {}
 };
 
 }  // namespace content
 
 #endif  // CONTENT_PUBLIC_BROWSER_DEVTOOLS_AGENT_HOST_H_