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 fd9cfedb62dea011092f0a282580f4852d2ea7b5..1bd1a82de58568b078d166c01d023bd8cefad46f 100644 |
--- a/chrome/browser/devtools/chrome_devtools_manager_delegate.cc |
+++ b/chrome/browser/devtools/chrome_devtools_manager_delegate.cc |
@@ -5,9 +5,16 @@ |
#include "chrome/browser/devtools/chrome_devtools_manager_delegate.h" |
#include "base/values.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/web_contents.h" |
ChromeDevToolsManagerDelegate::ChromeDevToolsManagerDelegate() |
: network_protocol_handler_(new DevToolsNetworkProtocolHandler()) { |
@@ -23,10 +30,8 @@ void ChromeDevToolsManagerDelegate::Inspect( |
// TODO(horo): Support other types of DevToolsAgentHost when necessary. |
NOTREACHED() << "Inspect() only supports workers."; |
} |
-#if !defined(OS_ANDROID) |
if (Profile* profile = Profile::FromBrowserContext(browser_context)) |
DevToolsWindow::OpenDevToolsWindowForWorker(profile, agent_host); |
-#endif |
} |
base::DictionaryValue* ChromeDevToolsManagerDelegate::HandleCommand( |
@@ -40,3 +45,35 @@ void ChromeDevToolsManagerDelegate::DevToolsAgentStateChanged( |
bool attached) { |
network_protocol_handler_->DevToolsAgentStateChanged(agent_host, attached); |
} |
+ |
+std::string ChromeDevToolsManagerDelegate::GetPageThumbnailData( |
+ const GURL& url) { |
+ 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(); |
+} |
+ |
+scoped_ptr<content::DevToolsTarget> |
+ChromeDevToolsManagerDelegate::CreateNewTarget(const GURL& url) { |
+ chrome::NavigateParams params(ProfileManager::GetLastUsedProfile(), |
+ url, ui::PAGE_TRANSITION_AUTO_TOPLEVEL); |
+ params.disposition = NEW_FOREGROUND_TAB; |
+ chrome::Navigate(¶ms); |
+ if (!params.target_contents) |
+ return scoped_ptr<content::DevToolsTarget>(); |
+ return scoped_ptr<content::DevToolsTarget>( |
+ DevToolsTargetImpl::CreateForWebContents(params.target_contents, true)); |
+} |
+ |
+void ChromeDevToolsManagerDelegate::EnumerateTargets(TargetCallback callback) { |
+ DevToolsTargetImpl::EnumerateAllTargets( |
+ *reinterpret_cast<DevToolsTargetImpl::Callback*>(&callback)); |
+} |
+ |