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

Side by Side 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, 7 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 unified diff | Download patch
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/devtools/chrome_devtools_manager_delegate.h" 5 #include "chrome/browser/devtools/chrome_devtools_manager_delegate.h"
6 6
7 #include "base/values.h" 7 #include "base/values.h"
8 #include "chrome/browser/devtools/devtools_target_impl.h" 8 #include "chrome/browser/devtools/devtools_target_impl.h"
9 #include "chrome/browser/devtools/devtools_window.h" 9 #include "chrome/browser/devtools/devtools_window.h"
10 #include "chrome/browser/history/top_sites_factory.h" 10 #include "chrome/browser/history/top_sites_factory.h"
11 #include "chrome/browser/profiles/profile.h" 11 #include "chrome/browser/profiles/profile.h"
12 #include "chrome/browser/profiles/profile_manager.h" 12 #include "chrome/browser/profiles/profile_manager.h"
13 #include "chrome/browser/ui/browser.h" 13 #include "chrome/browser/ui/browser.h"
14 #include "chrome/browser/ui/browser_iterator.h" 14 #include "chrome/browser/ui/browser_iterator.h"
15 #include "components/devtools_discovery/devtools_discovery_manager.h"
15 #include "components/history/core/browser/top_sites.h" 16 #include "components/history/core/browser/top_sites.h"
16 #include "content/public/browser/browser_thread.h" 17 #include "content/public/browser/browser_thread.h"
17 #include "content/public/browser/devtools_agent_host.h" 18 #include "content/public/browser/devtools_agent_host.h"
18 #include "content/public/browser/web_contents.h" 19 #include "content/public/browser/web_contents.h"
19 20
20 ChromeDevToolsManagerDelegate::ChromeDevToolsManagerDelegate() 21 ChromeDevToolsManagerDelegate::ChromeDevToolsManagerDelegate()
21 : network_protocol_handler_(new DevToolsNetworkProtocolHandler()) { 22 : network_protocol_handler_(new DevToolsNetworkProtocolHandler()) {
22 } 23 }
23 24
24 ChromeDevToolsManagerDelegate::~ChromeDevToolsManagerDelegate() { 25 ChromeDevToolsManagerDelegate::~ChromeDevToolsManagerDelegate() {
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
59 continue; 60 continue;
60 scoped_refptr<base::RefCountedMemory> data; 61 scoped_refptr<base::RefCountedMemory> data;
61 if (top_sites->GetPageThumbnail(url, false, &data)) 62 if (top_sites->GetPageThumbnail(url, false, &data))
62 return std::string(data->front_as<char>(), data->size()); 63 return std::string(data->front_as<char>(), data->size());
63 } 64 }
64 return std::string(); 65 return std::string();
65 } 66 }
66 67
67 scoped_ptr<content::DevToolsTarget> 68 scoped_ptr<content::DevToolsTarget>
68 ChromeDevToolsManagerDelegate::CreateNewTarget(const GURL& url) { 69 ChromeDevToolsManagerDelegate::CreateNewTarget(const GURL& url) {
69 chrome::NavigateParams params(ProfileManager::GetLastUsedProfile(), 70 return devtools_discovery::DevToolsDiscoveryManager::GetInstance()->
70 url, ui::PAGE_TRANSITION_AUTO_TOPLEVEL); 71 CreateNew(url);
71 params.disposition = NEW_FOREGROUND_TAB;
72 chrome::Navigate(&params);
73 if (!params.target_contents)
74 return scoped_ptr<content::DevToolsTarget>();
75 return scoped_ptr<content::DevToolsTarget>(
76 DevToolsTargetImpl::CreateForWebContents(params.target_contents, true));
77 } 72 }
78 73
79 void ChromeDevToolsManagerDelegate::EnumerateTargets(TargetCallback callback) { 74 void ChromeDevToolsManagerDelegate::EnumerateTargets(TargetCallback callback) {
80 DevToolsTargetImpl::EnumerateAllTargets( 75 TargetList targets;
81 *reinterpret_cast<DevToolsTargetImpl::Callback*>(&callback)); 76 devtools_discovery::DevToolsDiscoveryManager* discovery_manager =
77 devtools_discovery::DevToolsDiscoveryManager::GetInstance();
78 for (const auto& descriptor : discovery_manager->GetDescriptors())
79 targets.push_back(descriptor);
80 callback.Run(targets);
82 } 81 }
83 82
OLDNEW
« 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