[DevTools] Move target-related methods from DevToolsHttpHandlerDelegate to DevToolsManagerDelegate.

chrome/browser/devtools/chrome_devtools_manager_delegate.cc

Index: chrome/browser/devtools/chrome_devtools_manager_delegate.cc
diff --git a/chrome/browser/devtools/chrome_devtools_manager_delegate.cc b/chrome/browser/devtools/chrome_devtools_manager_delegate.cc
index a7cd2f63e806cf6e5061cac3a3c02540d5810c35..897d53bcdf1f3cae3d3cf4c8b8144f017655c125 100644
--- a/chrome/browser/devtools/chrome_devtools_manager_delegate.cc
+++ b/chrome/browser/devtools/chrome_devtools_manager_delegate.cc
@@ -9,13 +9,15 @@
 #include "chrome/browser/devtools/devtools_network_controller.h"
 #include "chrome/browser/devtools/devtools_protocol.h"
 #include "chrome/browser/devtools/devtools_protocol_constants.h"
+#include "chrome/browser/devtools/devtools_target_impl.h"
 #include "chrome/browser/devtools/devtools_window.h"
+#include "chrome/browser/history/top_sites.h"
 #include "chrome/browser/profiles/profile.h"
+#include "chrome/browser/profiles/profile_manager.h"
+#include "chrome/browser/ui/browser.h"
+#include "chrome/browser/ui/browser_iterator.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/devtools_agent_host.h"
-#include "content/public/browser/render_process_host.h"
-#include "content/public/browser/render_view_host.h"
-#include "content/public/browser/site_instance.h"
 #include "content/public/browser/web_contents.h"
 
 ChromeDevToolsManagerDelegate::ChromeDevToolsManagerDelegate() {
@@ -132,3 +134,47 @@ void ChromeDevToolsManagerDelegate::DevToolsAgentStateChanged(
     conditions.reset(new DevToolsNetworkConditions());
   UpdateNetworkState(agent_host, conditions.Pass());
 }
+
+std::string ChromeDevToolsManagerDelegate::GetPageThumbnailData(
+    const GURL& url) {
+#if defined(OS_ANDROID)
+  return "";
+#else
+  for (chrome::BrowserIterator it; !it.done(); it.Next()) {
+    Profile* profile = (*it)->profile();
+    history::TopSites* top_sites = profile->GetTopSites();
+    if (!top_sites)
+      continue;
+    scoped_refptr<base::RefCountedMemory> data;
+    if (top_sites->GetPageThumbnail(url, false, &data))
+      return std::string(data->front_as<char>(), data->size());
+  }
+
+  return std::string();
+#endif
+}
+
+scoped_ptr<content::DevToolsTarget>
+ChromeDevToolsManagerDelegate::CreateNewTarget(const GURL& url) {
+#if defined(OS_ANDROID)

[pfeldman, 2014/09/11 17:42:35]

Why these checks? Don't we have a separate implementation for Android now?

[dgozman, 2014/09/11 17:48:09]

We actually need network-related stuff from this file on Android too, so I
inherited from this class on Android.
ifdef is required so this code is not compiled on Android (otherwise it does not
link). I don't feel really good about this. Probably worth extracting network
parts from this and have two separate delegates.

+  return scoped_ptr<content::DevToolsTarget>();
+#else
+  chrome::NavigateParams params(ProfileManager::GetLastUsedProfile(),
+      url, content::PAGE_TRANSITION_AUTO_TOPLEVEL);
+  params.disposition = NEW_FOREGROUND_TAB;
+  chrome::Navigate(&params);
+  if (!params.target_contents)
+    return scoped_ptr<content::DevToolsTarget>();
+  return scoped_ptr<content::DevToolsTarget>(
+      DevToolsTargetImpl::CreateForWebContents(params.target_contents, true));
+#endif
+}
+
+void ChromeDevToolsManagerDelegate::EnumerateTargets(TargetCallback callback) {
+#if defined(OS_ANDROID)
+#else
+  DevToolsTargetImpl::EnumerateAllTargets(
+      *reinterpret_cast<DevToolsTargetImpl::Callback*>(&callback));
+#endif
+}
+