DevTools: Extract target discovery and manipulation from DevToolsHttpHandlerImpl

content/public/browser/devtools_http_handler_delegate.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_HTTP_HANDLER_DELEGATE_H_
 #define CONTENT_PUBLIC_BROWSER_DEVTOOLS_HTTP_HANDLER_DELEGATE_H_
 
 #include <string>
 #include <vector>
 
 #include "base/files/file_path.h"
 #include "base/memory/scoped_ptr.h"
+#include "content/public/browser/devtools_target.h"

[jam, 2013/10/01 17:20:51]

do you need this or can you just forward declare DevTooolsTarget?

[Vladislav Kaznacheev, 2013/10/02 10:28:29]

Used forward declaration.

 #include "net/socket/stream_listen_socket.h"
 
 class GURL;
 
 namespace content {
 
-class RenderViewHost;
-
 class DevToolsHttpHandlerDelegate {
  public:
-  enum TargetType {
-    kTargetTypeTab = 0,
-    kTargetTypeOther,
-  };
+  virtual ~DevToolsHttpHandlerDelegate() {}
 
-  virtual ~DevToolsHttpHandlerDelegate() {}
+  typedef std::vector<scoped_refptr<DevToolsTarget> > TargetList;
+  typedef base::Callback<void(const TargetList&)> TargetCallback;

[jam, 2013/10/01 17:20:51]

nit: the convention for the content api is to list every typedef right above
where it's used. so line 24 would be above line 42, and line 25 would be above
45

[Vladislav Kaznacheev, 2013/10/02 10:28:29]

Done.

 
   // Should return discovery page HTML that should list available tabs
   // and provide attach links.
   virtual std::string GetDiscoveryPageHTML() = 0;
 
   // Returns true if and only if frontend resources are bundled.
   virtual bool BundlesFrontendResources() = 0;
 
   // Returns path to the front-end files on the local filesystem for debugging.
   virtual base::FilePath GetDebugFrontendDir() = 0;
 
   // Get a thumbnail for a given page. Returns non-empty string iff we have the
   // thumbnail.
   virtual std::string GetPageThumbnailData(const GURL& url) = 0;
 
-  // Creates new inspectable target and returns its render view host.
-  virtual RenderViewHost* CreateNewTarget() = 0;
+  // Creates new inspectable target.
+  virtual scoped_refptr<DevToolsTarget> CreateNewTarget() = 0;
 
-  // Returns the type of the target.
-  virtual TargetType GetTargetType(RenderViewHost*) = 0;
-
-  // Provides the delegate with an ability to supply a description for views.
-  virtual std::string GetViewDescription(content::RenderViewHost*) = 0;
+  // Requests the list of all inspectable targets.
+  virtual void EnumerateTargets(TargetCallback callback) = 0;
 
   // Creates named socket for reversed tethering implementation (used with
   // remote debugging, primarily for mobile).
   virtual scoped_ptr<net::StreamListenSocket> CreateSocketForTethering(
       net::StreamListenSocket::Delegate* delegate,
       std::string* name) = 0;
 };
 
 }  // namespace content
 
 #endif  // CONTENT_PUBLIC_BROWSER_DEVTOOLS_HTTP_HANDLER_DELEGATE_H_