Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(811)

Unified Diff: chrome/browser/devtools/chrome_devtools_manager_delegate.cc

Issue 1109483003: [DevTools] Migrate chrome to devtools_discovery. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@devtools-discovery-android
Patch Set: rebased Created 5 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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 81f354d89150c9a245e7e53935387d7c0be38568..f115a391ee36fc1328bda858836b09405582f7db 100644
--- a/chrome/browser/devtools/chrome_devtools_manager_delegate.cc
+++ b/chrome/browser/devtools/chrome_devtools_manager_delegate.cc
@@ -12,6 +12,7 @@
#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"
@@ -66,18 +67,16 @@ std::string ChromeDevToolsManagerDelegate::GetPageThumbnailData(
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(&params);
- if (!params.target_contents)
- return scoped_ptr<content::DevToolsTarget>();
- return scoped_ptr<content::DevToolsTarget>(
- DevToolsTargetImpl::CreateForWebContents(params.target_contents, true));
+ return devtools_discovery::DevToolsDiscoveryManager::GetInstance()->
+ CreateNew(url);
}
void ChromeDevToolsManagerDelegate::EnumerateTargets(TargetCallback callback) {
- DevToolsTargetImpl::EnumerateAllTargets(
- *reinterpret_cast<DevToolsTargetImpl::Callback*>(&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);
}
« no previous file with comments | « chrome/browser/devtools/chrome_devtools_discovery_provider.cc ('k') | chrome/browser/devtools/devtools_target_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698