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

Unified Diff: content/browser/devtools/devtools_agent_host_impl.cc

Issue 988003002: DevTools: pick sw targets to attach to on the backend side. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebaselined Created 5 years, 9 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
« no previous file with comments | « no previous file | content/browser/devtools/protocol/service_worker_handler.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/devtools/devtools_agent_host_impl.cc
diff --git a/content/browser/devtools/devtools_agent_host_impl.cc b/content/browser/devtools/devtools_agent_host_impl.cc
index cc524bc96d22c7499d6b02980a18c62f6f2bb2cb..213ae9780240ccd0269791cb9ea24e78e9465a7d 100644
--- a/content/browser/devtools/devtools_agent_host_impl.cc
+++ b/content/browser/devtools/devtools_agent_host_impl.cc
@@ -13,7 +13,9 @@
#include "content/browser/devtools/devtools_manager.h"
#include "content/browser/devtools/forwarding_agent_host.h"
#include "content/browser/devtools/render_frame_devtools_agent_host.h"
+#include "content/browser/devtools/service_worker_devtools_agent_host.h"
#include "content/browser/devtools/service_worker_devtools_manager.h"
+#include "content/browser/devtools/shared_worker_devtools_agent_host.h"
#include "content/browser/devtools/shared_worker_devtools_manager.h"
#include "content/public/browser/browser_thread.h"
#include "content/public/browser/devtools_manager_delegate.h"
@@ -33,8 +35,16 @@ base::LazyInstance<AgentStateCallbacks>::Leaky g_callbacks =
// static
DevToolsAgentHost::List DevToolsAgentHost::GetOrCreateAll() {
List result;
- SharedWorkerDevToolsManager::GetInstance()->AddAllAgentHosts(&result);
- ServiceWorkerDevToolsManager::GetInstance()->AddAllAgentHosts(&result);
+ SharedWorkerDevToolsAgentHost::List shared_list;
+ SharedWorkerDevToolsManager::GetInstance()->AddAllAgentHosts(&shared_list);
+ for (const auto& host : shared_list)
+ result.push_back(host);
+
+ ServiceWorkerDevToolsAgentHost::List service_list;
+ ServiceWorkerDevToolsManager::GetInstance()->AddAllAgentHosts(&service_list);
+ for (const auto& host : service_list)
+ result.push_back(host);
+
RenderFrameDevToolsAgentHost::AddAllAgentHosts(&result);
return result;
}
« no previous file with comments | « no previous file | content/browser/devtools/protocol/service_worker_handler.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698