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

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: track url, not frame 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
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 a5f9f86f58177710da397819c0b69c4c305ce0bc..f5dca751ffeaab16ee482091b6428a305ae66f49 100644
--- a/content/browser/devtools/devtools_agent_host_impl.cc
+++ b/content/browser/devtools/devtools_agent_host_impl.cc
@@ -12,7 +12,9 @@
#include "base/lazy_instance.h"
#include "content/browser/devtools/devtools_manager.h"
#include "content/browser/devtools/forwarding_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"
@@ -31,9 +33,17 @@ base::LazyInstance<AgentStateCallbacks>::Leaky g_callbacks =
// static
DevToolsAgentHost::List DevToolsAgentHost::GetOrCreateAll() {
+ SharedWorkerDevToolsAgentHost::List shared_list;
+ SharedWorkerDevToolsManager::GetInstance()->AddAllAgentHosts(&shared_list);
+ ServiceWorkerDevToolsAgentHost::List service_list;
+ ServiceWorkerDevToolsManager::GetInstance()->AddAllAgentHosts(&service_list);
+
List result;
- SharedWorkerDevToolsManager::GetInstance()->AddAllAgentHosts(&result);
- ServiceWorkerDevToolsManager::GetInstance()->AddAllAgentHosts(&result);
+ for (const auto& host : shared_list)
+ result.push_back(host);
+ for (const auto& host : service_list)
+ result.push_back(host);
+
std::vector<WebContents*> wc_list =
DevToolsAgentHostImpl::GetInspectableWebContents();
for (std::vector<WebContents*>::iterator it = wc_list.begin();

Powered by Google App Engine
This is Rietveld 408576698