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

Side by Side Diff: content/browser/devtools/devtools_agent_host_impl.cc

Issue 2272213003: DevTools: remove devtools_discovery (merged into content). (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: build fix 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 (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 "content/browser/devtools/devtools_agent_host_impl.h" 5 #include "content/browser/devtools/devtools_agent_host_impl.h"
6 6
7 #include <map> 7 #include <map>
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/json/json_writer.h" 10 #include "base/json/json_writer.h"
11 #include "base/lazy_instance.h" 11 #include "base/lazy_instance.h"
12 #include "content/browser/devtools/devtools_manager.h" 12 #include "content/browser/devtools/devtools_manager.h"
13 #include "content/browser/devtools/forwarding_agent_host.h" 13 #include "content/browser/devtools/forwarding_agent_host.h"
14 #include "content/browser/devtools/protocol/devtools_protocol_dispatcher.h" 14 #include "content/browser/devtools/protocol/devtools_protocol_dispatcher.h"
15 #include "content/browser/devtools/render_frame_devtools_agent_host.h" 15 #include "content/browser/devtools/render_frame_devtools_agent_host.h"
16 #include "content/browser/devtools/service_worker_devtools_agent_host.h" 16 #include "content/browser/devtools/service_worker_devtools_agent_host.h"
17 #include "content/browser/devtools/service_worker_devtools_manager.h" 17 #include "content/browser/devtools/service_worker_devtools_manager.h"
18 #include "content/browser/devtools/shared_worker_devtools_agent_host.h" 18 #include "content/browser/devtools/shared_worker_devtools_agent_host.h"
19 #include "content/browser/devtools/shared_worker_devtools_manager.h" 19 #include "content/browser/devtools/shared_worker_devtools_manager.h"
20 #include "content/public/browser/browser_thread.h" 20 #include "content/public/browser/browser_thread.h"
21 21
22 namespace content { 22 namespace content {
23 23
24 namespace { 24 namespace {
25 typedef std::map<std::string, DevToolsAgentHostImpl*> Instances; 25 typedef std::map<std::string, DevToolsAgentHostImpl*> Instances;
26 base::LazyInstance<Instances>::Leaky g_instances = LAZY_INSTANCE_INITIALIZER; 26 base::LazyInstance<Instances>::Leaky g_instances = LAZY_INSTANCE_INITIALIZER;
27 27
28 typedef std::vector<const DevToolsAgentHost::AgentStateCallback*> 28 using AgentStateCallbacks =
29 AgentStateCallbacks; 29 std::vector<const DevToolsAgentHost::AgentStateCallback*>;
30 base::LazyInstance<AgentStateCallbacks>::Leaky g_callbacks = 30 base::LazyInstance<AgentStateCallbacks>::Leaky g_callbacks =
31 LAZY_INSTANCE_INITIALIZER; 31 LAZY_INSTANCE_INITIALIZER;
32 using DiscoveryCallbacks =
33 std::vector<DevToolsAgentHost::DiscoveryCallback>;
34 base::LazyInstance<DiscoveryCallbacks>::Leaky g_providers =
35 LAZY_INSTANCE_INITIALIZER;
32 } // namespace 36 } // namespace
33 37
34 char DevToolsAgentHost::kTypePage[] = "page"; 38 char DevToolsAgentHost::kTypePage[] = "page";
35 char DevToolsAgentHost::kTypeFrame[] = "frame"; 39 char DevToolsAgentHost::kTypeFrame[] = "frame";
36 char DevToolsAgentHost::kTypeSharedWorker[] = "shared_worker"; 40 char DevToolsAgentHost::kTypeSharedWorker[] = "shared_worker";
37 char DevToolsAgentHost::kTypeServiceWorker[] = "service_worker"; 41 char DevToolsAgentHost::kTypeServiceWorker[] = "service_worker";
38 char DevToolsAgentHost::kTypeExternal[] = "external"; 42 char DevToolsAgentHost::kTypeExternal[] = "external";
39 char DevToolsAgentHost::kTypeBrowser[] = "browser"; 43 char DevToolsAgentHost::kTypeBrowser[] = "browser";
40 char DevToolsAgentHost::kTypeOther[] = "other"; 44 char DevToolsAgentHost::kTypeOther[] = "other";
41 45
42 // static 46 // static
47 DevToolsManagerDelegate* DevToolsAgentHost::GetDevToolsManagerDelegate() {
48 DevToolsManager* manager = DevToolsManager::GetInstance();
49 return manager->delegate();
50 }
51
52 // static
43 std::string DevToolsAgentHost::GetProtocolVersion() { 53 std::string DevToolsAgentHost::GetProtocolVersion() {
44 return std::string(devtools::kProtocolVersion); 54 return std::string(devtools::kProtocolVersion);
45 } 55 }
46 56
47 // static 57 // static
48 bool DevToolsAgentHost::IsSupportedProtocolVersion(const std::string& version) { 58 bool DevToolsAgentHost::IsSupportedProtocolVersion(const std::string& version) {
49 return devtools::IsSupportedProtocolVersion(version); 59 return devtools::IsSupportedProtocolVersion(version);
50 } 60 }
51 61
52 // static 62 // static
63 void DevToolsAgentHost::AddDiscoveryProvider(
64 const DiscoveryCallback& callback) {
65 g_providers.Get().push_back(callback);
66 }
67
68 // static
53 DevToolsAgentHost::List DevToolsAgentHost::GetOrCreateAll() { 69 DevToolsAgentHost::List DevToolsAgentHost::GetOrCreateAll() {
54 List result; 70 List result;
55 SharedWorkerDevToolsAgentHost::List shared_list; 71 SharedWorkerDevToolsAgentHost::List shared_list;
56 SharedWorkerDevToolsManager::GetInstance()->AddAllAgentHosts(&shared_list); 72 SharedWorkerDevToolsManager::GetInstance()->AddAllAgentHosts(&shared_list);
57 for (const auto& host : shared_list) 73 for (const auto& host : shared_list)
58 result.push_back(host); 74 result.push_back(host);
59 75
60 ServiceWorkerDevToolsAgentHost::List service_list; 76 ServiceWorkerDevToolsAgentHost::List service_list;
61 ServiceWorkerDevToolsManager::GetInstance()->AddAllAgentHosts(&service_list); 77 ServiceWorkerDevToolsManager::GetInstance()->AddAllAgentHosts(&service_list);
62 for (const auto& host : service_list) 78 for (const auto& host : service_list)
63 result.push_back(host); 79 result.push_back(host);
64 80
65 RenderFrameDevToolsAgentHost::AddAllAgentHosts(&result); 81 RenderFrameDevToolsAgentHost::AddAllAgentHosts(&result);
66 return result; 82 return result;
67 } 83 }
68 84
85 // static
86 DevToolsAgentHost::List DevToolsAgentHost::DiscoverAllHosts() {
87 content::DevToolsAgentHost::List result;
88 // Force create all the delegates.
89 DevToolsManager::GetInstance();
90 if (!g_providers.Get().size())
91 return DevToolsAgentHost::GetOrCreateAll();
92 for (auto& provider : g_providers.Get()) {
93 content::DevToolsAgentHost::List partial = provider.Run();
94 result.insert(result.begin(), partial.begin(), partial.end());
95 }
96 return result;
97 }
98
69 // Called on the UI thread. 99 // Called on the UI thread.
70 // static 100 // static
71 scoped_refptr<DevToolsAgentHost> DevToolsAgentHost::GetForWorker( 101 scoped_refptr<DevToolsAgentHost> DevToolsAgentHost::GetForWorker(
72 int worker_process_id, 102 int worker_process_id,
73 int worker_route_id) { 103 int worker_route_id) {
74 if (scoped_refptr<DevToolsAgentHost> host = 104 if (scoped_refptr<DevToolsAgentHost> host =
75 SharedWorkerDevToolsManager::GetInstance() 105 SharedWorkerDevToolsManager::GetInstance()
76 ->GetDevToolsAgentHostForWorker(worker_process_id, 106 ->GetDevToolsAgentHostForWorker(worker_process_id,
77 worker_route_id)) { 107 worker_route_id)) {
78 return host; 108 return host;
(...skipping 267 matching lines...) Expand 10 before | Expand all | Expand 10 after
346 if (message_buffer_.size() != message_buffer_size_) 376 if (message_buffer_.size() != message_buffer_size_)
347 return false; 377 return false;
348 callback_.Run(chunk.session_id, message_buffer_); 378 callback_.Run(chunk.session_id, message_buffer_);
349 message_buffer_ = std::string(); 379 message_buffer_ = std::string();
350 message_buffer_size_ = 0; 380 message_buffer_size_ = 0;
351 } 381 }
352 return true; 382 return true;
353 } 383 }
354 384
355 } // namespace content 385 } // namespace content
OLDNEW
« no previous file with comments | « components/devtools_http_handler/devtools_http_handler.cc ('k') | content/browser/devtools/protocol/browser_handler.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698