| 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 f115a391ee36fc1328bda858836b09405582f7db..8a655cede0941bd4fe272247161d4bed966139a1 100644
|
| --- a/chrome/browser/devtools/chrome_devtools_manager_delegate.cc
|
| +++ b/chrome/browser/devtools/chrome_devtools_manager_delegate.cc
|
| @@ -4,19 +4,11 @@
|
|
|
| #include "chrome/browser/devtools/chrome_devtools_manager_delegate.h"
|
|
|
| -#include "base/values.h"
|
| -#include "chrome/browser/devtools/devtools_target_impl.h"
|
| +#if !defined(OS_ANDROID)
|
| #include "chrome/browser/devtools/devtools_window.h"
|
| -#include "chrome/browser/history/top_sites_factory.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 "components/devtools_discovery/devtools_discovery_manager.h"
|
| -#include "components/history/core/browser/top_sites.h"
|
| -#include "content/public/browser/browser_thread.h"
|
| #include "content/public/browser/devtools_agent_host.h"
|
| -#include "content/public/browser/web_contents.h"
|
| +#endif // !defined(OS_ANDROID)
|
|
|
| ChromeDevToolsManagerDelegate::ChromeDevToolsManagerDelegate()
|
| : network_protocol_handler_(new DevToolsNetworkProtocolHandler()) {
|
| @@ -28,6 +20,7 @@ ChromeDevToolsManagerDelegate::~ChromeDevToolsManagerDelegate() {
|
| void ChromeDevToolsManagerDelegate::Inspect(
|
| content::BrowserContext* browser_context,
|
| content::DevToolsAgentHost* agent_host) {
|
| +#if !defined(OS_ANDROID)
|
| content::DevToolsAgentHost::Type type = agent_host->GetType();
|
| if (type != content::DevToolsAgentHost::TYPE_SHARED_WORKER &&
|
| type != content::DevToolsAgentHost::TYPE_SERVICE_WORKER) {
|
| @@ -36,6 +29,7 @@ void ChromeDevToolsManagerDelegate::Inspect(
|
| }
|
| if (Profile* profile = Profile::FromBrowserContext(browser_context))
|
| DevToolsWindow::OpenDevToolsWindowForWorker(profile, agent_host);
|
| +#endif // !defined(OS_ANDROID)
|
| }
|
|
|
| base::DictionaryValue* ChromeDevToolsManagerDelegate::HandleCommand(
|
| @@ -49,34 +43,3 @@ 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();
|
| - scoped_refptr<history::TopSites> top_sites =
|
| - TopSitesFactory::GetForProfile(profile);
|
| - 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) {
|
| - return devtools_discovery::DevToolsDiscoveryManager::GetInstance()->
|
| - CreateNew(url);
|
| -}
|
| -
|
| -void ChromeDevToolsManagerDelegate::EnumerateTargets(TargetCallback callback) {
|
| - TargetList targets;
|
| - devtools_discovery::DevToolsDiscoveryManager* discovery_manager =
|
| - devtools_discovery::DevToolsDiscoveryManager::GetInstance();
|
| - for (const auto& descriptor : discovery_manager->GetDescriptors())
|
| - targets.push_back(descriptor);
|
| - callback.Run(targets);
|
| -}
|
| -
|
|
|