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

Side by Side Diff: chrome/browser/devtools/chrome_devtools_discovery_provider.cc

Issue 2289773002: Revert of DevTools: merge devtools target with devtools host, part 1 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 3 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 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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_discovery_provider.h" 5 #include "chrome/browser/devtools/chrome_devtools_discovery_provider.h"
6 6
7 #include "base/memory/ptr_util.h" 7 #include "base/memory/ptr_util.h"
8 #include "chrome/browser/devtools/devtools_target_impl.h" 8 #include "chrome/browser/devtools/devtools_target_impl.h"
9 #include "chrome/browser/profiles/profile_manager.h" 9 #include "chrome/browser/profiles/profile_manager.h"
10 #include "chrome/browser/ui/browser_navigator.h" 10 #include "chrome/browser/ui/browser_navigator.h"
11 #include "chrome/browser/ui/browser_navigator_params.h" 11 #include "chrome/browser/ui/browser_navigator_params.h"
12 #include "content/public/browser/devtools_agent_host.h"
13 12
14 namespace { 13 namespace {
15 14
16 std::unique_ptr<devtools_discovery::DevToolsTargetDescriptor> 15 std::unique_ptr<devtools_discovery::DevToolsTargetDescriptor>
17 CreateNewChromeTab(const GURL& url) { 16 CreateNewChromeTab(const GURL& url) {
18 chrome::NavigateParams params(ProfileManager::GetLastUsedProfile(), 17 chrome::NavigateParams params(ProfileManager::GetLastUsedProfile(),
19 url, ui::PAGE_TRANSITION_AUTO_TOPLEVEL); 18 url, ui::PAGE_TRANSITION_AUTO_TOPLEVEL);
20 params.disposition = NEW_FOREGROUND_TAB; 19 params.disposition = NEW_FOREGROUND_TAB;
21 chrome::Navigate(&params); 20 chrome::Navigate(&params);
22 if (!params.target_contents) 21 if (!params.target_contents)
23 return std::unique_ptr<devtools_discovery::DevToolsTargetDescriptor>(); 22 return std::unique_ptr<devtools_discovery::DevToolsTargetDescriptor>();
24 23 return DevToolsTargetImpl::CreateForTab(params.target_contents);
25 if (!params.target_contents)
26 return nullptr;
27 scoped_refptr<content::DevToolsAgentHost> host =
28 content::DevToolsAgentHost::GetOrCreateFor(params.target_contents);
29 return std::unique_ptr<DevToolsTargetImpl>(new DevToolsTargetImpl(host));
30 } 24 }
31 25
32 } // namespace 26 } // namespace
33 27
34 ChromeDevToolsDiscoveryProvider::ChromeDevToolsDiscoveryProvider() { 28 ChromeDevToolsDiscoveryProvider::ChromeDevToolsDiscoveryProvider() {
35 } 29 }
36 30
37 ChromeDevToolsDiscoveryProvider::~ChromeDevToolsDiscoveryProvider() { 31 ChromeDevToolsDiscoveryProvider::~ChromeDevToolsDiscoveryProvider() {
38 } 32 }
39 33
40 devtools_discovery::DevToolsTargetDescriptor::List 34 devtools_discovery::DevToolsTargetDescriptor::List
41 ChromeDevToolsDiscoveryProvider::GetDescriptors() { 35 ChromeDevToolsDiscoveryProvider::GetDescriptors() {
42 std::vector<DevToolsTargetImpl*> list = DevToolsTargetImpl::EnumerateAll(); 36 std::vector<DevToolsTargetImpl*> list = DevToolsTargetImpl::EnumerateAll();
43 devtools_discovery::DevToolsTargetDescriptor::List result; 37 devtools_discovery::DevToolsTargetDescriptor::List result;
44 result.reserve(list.size()); 38 result.reserve(list.size());
45 for (auto* descriptor : list) 39 for (auto* descriptor : list)
46 result.push_back(descriptor); 40 result.push_back(descriptor);
47 return result; 41 return result;
48 } 42 }
49 43
50 // static 44 // static
51 void ChromeDevToolsDiscoveryProvider::Install() { 45 void ChromeDevToolsDiscoveryProvider::Install() {
52 devtools_discovery::DevToolsDiscoveryManager* discovery_manager = 46 devtools_discovery::DevToolsDiscoveryManager* discovery_manager =
53 devtools_discovery::DevToolsDiscoveryManager::GetInstance(); 47 devtools_discovery::DevToolsDiscoveryManager::GetInstance();
54 discovery_manager->AddProvider( 48 discovery_manager->AddProvider(
55 base::WrapUnique(new ChromeDevToolsDiscoveryProvider())); 49 base::WrapUnique(new ChromeDevToolsDiscoveryProvider()));
56 discovery_manager->SetCreateCallback(base::Bind(&CreateNewChromeTab)); 50 discovery_manager->SetCreateCallback(base::Bind(&CreateNewChromeTab));
57 } 51 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698