OLD | NEW |
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 "components/devtools_discovery/devtools_discovery_manager.h" | 5 #include "components/devtools_discovery/devtools_discovery_manager.h" |
6 | 6 |
7 #include "base/stl_util.h" | 7 #include "base/stl_util.h" |
8 #include "components/devtools_discovery/basic_target_descriptor.h" | 8 #include "components/devtools_discovery/basic_target_descriptor.h" |
9 #include "content/public/browser/devtools_agent_host.h" | 9 #include "content/public/browser/devtools_agent_host.h" |
10 | 10 |
11 using content::DevToolsAgentHost; | 11 using content::DevToolsAgentHost; |
12 | 12 |
13 namespace devtools_discovery { | 13 namespace devtools_discovery { |
14 | 14 |
15 // static | 15 // static |
16 DevToolsDiscoveryManager* DevToolsDiscoveryManager::GetInstance() { | 16 DevToolsDiscoveryManager* DevToolsDiscoveryManager::GetInstance() { |
17 return base::Singleton<DevToolsDiscoveryManager>::get(); | 17 return base::Singleton<DevToolsDiscoveryManager>::get(); |
18 } | 18 } |
19 | 19 |
20 DevToolsDiscoveryManager::DevToolsDiscoveryManager() { | 20 DevToolsDiscoveryManager::DevToolsDiscoveryManager() { |
21 } | 21 } |
22 | 22 |
23 DevToolsDiscoveryManager::~DevToolsDiscoveryManager() { | 23 DevToolsDiscoveryManager::~DevToolsDiscoveryManager() { |
24 STLDeleteElements(&providers_); | 24 STLDeleteElements(&providers_); |
25 } | 25 } |
26 | 26 |
27 void DevToolsDiscoveryManager::AddProvider(scoped_ptr<Provider> provider) { | 27 void DevToolsDiscoveryManager::AddProvider(std::unique_ptr<Provider> provider) { |
28 providers_.push_back(provider.release()); | 28 providers_.push_back(provider.release()); |
29 } | 29 } |
30 | 30 |
31 DevToolsTargetDescriptor::List DevToolsDiscoveryManager::GetDescriptors() { | 31 DevToolsTargetDescriptor::List DevToolsDiscoveryManager::GetDescriptors() { |
32 if (providers_.size()) | 32 if (providers_.size()) |
33 return GetDescriptorsFromProviders(); | 33 return GetDescriptorsFromProviders(); |
34 | 34 |
35 DevToolsAgentHost::List agent_hosts = DevToolsAgentHost::GetOrCreateAll(); | 35 DevToolsAgentHost::List agent_hosts = DevToolsAgentHost::GetOrCreateAll(); |
36 DevToolsTargetDescriptor::List result; | 36 DevToolsTargetDescriptor::List result; |
37 result.reserve(agent_hosts.size()); | 37 result.reserve(agent_hosts.size()); |
38 for (const auto& agent_host : agent_hosts) | 38 for (const auto& agent_host : agent_hosts) |
39 result.push_back(new BasicTargetDescriptor(agent_host)); | 39 result.push_back(new BasicTargetDescriptor(agent_host)); |
40 return result; | 40 return result; |
41 } | 41 } |
42 | 42 |
43 void DevToolsDiscoveryManager::SetCreateCallback( | 43 void DevToolsDiscoveryManager::SetCreateCallback( |
44 const CreateCallback& callback) { | 44 const CreateCallback& callback) { |
45 create_callback_ = callback; | 45 create_callback_ = callback; |
46 } | 46 } |
47 | 47 |
48 scoped_ptr<DevToolsTargetDescriptor> | 48 std::unique_ptr<DevToolsTargetDescriptor> DevToolsDiscoveryManager::CreateNew( |
49 DevToolsDiscoveryManager::CreateNew(const GURL& url) { | 49 const GURL& url) { |
50 if (create_callback_.is_null()) | 50 if (create_callback_.is_null()) |
51 return scoped_ptr<DevToolsTargetDescriptor>(); | 51 return nullptr; |
52 return create_callback_.Run(url); | 52 return create_callback_.Run(url); |
53 } | 53 } |
54 | 54 |
55 DevToolsTargetDescriptor::List | 55 DevToolsTargetDescriptor::List |
56 DevToolsDiscoveryManager::GetDescriptorsFromProviders() { | 56 DevToolsDiscoveryManager::GetDescriptorsFromProviders() { |
57 DevToolsTargetDescriptor::List result; | 57 DevToolsTargetDescriptor::List result; |
58 for (const auto& provider : providers_) { | 58 for (const auto& provider : providers_) { |
59 DevToolsTargetDescriptor::List partial = provider->GetDescriptors(); | 59 DevToolsTargetDescriptor::List partial = provider->GetDescriptors(); |
60 result.insert(result.begin(), partial.begin(), partial.end()); | 60 result.insert(result.begin(), partial.begin(), partial.end()); |
61 } | 61 } |
62 return result; | 62 return result; |
63 } | 63 } |
64 | 64 |
65 } // namespace devtools_discovery | 65 } // namespace devtools_discovery |
OLD | NEW |