DevTools: merge devtools target with devtools host, part 1

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 <memory>
 #include <string>
 #include <vector>
 
 #include "base/callback.h"
 #include "base/memory/ref_counted.h"
+#include "base/time/time.h"
 #include "content/common/content_export.h"
 #include "content/public/browser/devtools_agent_host_client.h"
 #include "url/gurl.h"
 
 namespace base {
 class SingleThreadTaskRunner;
 }
 
 namespace net {
 class ServerSocket;
 }
 
 namespace content {
 
 class BrowserContext;
 class DevToolsExternalAgentProxyDelegate;
 class RenderFrameHost;
 class WebContents;
 
 // Describes interface for managing devtools agents from browser process.
 class CONTENT_EXPORT DevToolsAgentHost
     : public base::RefCounted<DevToolsAgentHost> {
  public:
-  enum Type {
-    // Agent host associated with WebContents.
-    TYPE_WEB_CONTENTS,
-
-    // Agent host associated with RenderFrameHost.
-    TYPE_FRAME,
-
-    // Agent host associated with shared worker.
-    TYPE_SHARED_WORKER,
-
-    // Agent host associated with service worker.
-    TYPE_SERVICE_WORKER,
-
-    // Agent host associated with DevToolsExternalAgentProxyDelegate.
-    TYPE_EXTERNAL,
-
-    // Agent host associated with browser.
-    TYPE_BROWSER,
-  };
+  static char kTypePage[];
+  static char kTypeFrame[];
+  static char kTypeSharedWorker[];
+  static char kTypeServiceWorker[];
+  static char kTypeExternal[];
+  static char kTypeBrowser[];
+  static char kTypeOther[];
 
   // Latest DevTools protocol version supported.
   static std::string GetProtocolVersion();
 
   // Returns whether particular version of DevTools protocol is supported.
   static bool IsSupportedProtocolVersion(const std::string& version);
 
   // Returns DevToolsAgentHost with a given |id| or nullptr of it doesn't exist.
   static scoped_refptr<DevToolsAgentHost> GetForId(const std::string& id);
 
@@ skipping 63 matching lines @@
                                        const std::string& message) = 0;
 
   // Starts inspecting element at position (|x|, |y|).
   virtual void InspectElement(DevToolsAgentHostClient* client,
                               int x,
                               int y) = 0;
 
   // Returns the unique id of the agent.
   virtual std::string GetId() = 0;
 
+  // Returns the id of the parent target, or empty string if no parent.
+  virtual std::string GetParentId() = 0;
+
   // Returns web contents instance for this host if any.
   virtual WebContents* GetWebContents() = 0;
 
   // Returns related browser context instance if available.
   virtual BrowserContext* GetBrowserContext() = 0;
 
   // Temporarily detaches WebContents from this host. Must be followed by
   // a call to ConnectWebContents (may leak the host instance otherwise).
   virtual void DisconnectWebContents() = 0;
 
   // Attaches render view host to this host.
   virtual void ConnectWebContents(WebContents* web_contents) = 0;
 
   // Returns agent host type.
-  virtual Type GetType() = 0;
+  virtual std::string GetType() = 0;
 
   // Returns agent host title.
   virtual std::string GetTitle() = 0;
 
+  // Returns the target description.

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

target -> agent host

+  virtual std::string GetDescription() = 0;
+
   // Returns url associated with agent host.
   virtual GURL GetURL() = 0;
 
+  // Returns the favicon url for this target.
+  virtual GURL GetFaviconURL() = 0;
+
   // Activates agent host. Returns false if the operation failed.
   virtual bool Activate() = 0;
 
+  // Opens devtools for this agent host.
+  virtual void Inspect() = 0;
+
+  // Reloads the target.
+  virtual void Reload() = 0;
+
   // Closes agent host. Returns false if the operation failed.
   virtual bool Close() = 0;
 
+  // Returns the time when the target was last active.
+  virtual base::TimeTicks GetLastActivityTime() = 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_