Index: content/browser/devtools/devtools_http_handler_impl.cc |
diff --git a/content/browser/devtools/devtools_http_handler_impl.cc b/content/browser/devtools/devtools_http_handler_impl.cc |
index bd1be4b0dc7ce7611234c174ddbf1b762539be91..83af26ede16579a8d0b7e5514086dbf19b4138fb 100644 |
--- a/content/browser/devtools/devtools_http_handler_impl.cc |
+++ b/content/browser/devtools/devtools_http_handler_impl.cc |
@@ -22,6 +22,7 @@ |
#include "content/browser/devtools/devtools_protocol_constants.h" |
#include "content/browser/devtools/devtools_system_info_handler.h" |
#include "content/browser/devtools/devtools_tracing_handler.h" |
+#include "content/browser/devtools/embedded_worker_devtools_manager.h" |
#include "content/browser/devtools/tethering_handler.h" |
#include "content/common/devtools_messages.h" |
#include "content/public/browser/browser_thread.h" |
@@ -549,7 +550,13 @@ void DevToolsHttpHandlerImpl::OnTargetListReceived( |
int connection_id, |
const std::string& host, |
const DevToolsHttpHandlerDelegate::TargetList& targets) { |
- DevToolsHttpHandlerDelegate::TargetList sorted_targets = targets; |
+ typedef DevToolsHttpHandlerDelegate::TargetList Targets; |
+ Targets sorted_targets = targets; |
+ |
+ Targets workers = EmbeddedWorkerDevToolsManager::GetInstance() |
+ ->GetAllServiceWorkerTargets(); |
+ std::copy(workers.begin(), workers.end(), back_inserter(sorted_targets)); |
+ |
std::sort(sorted_targets.begin(), sorted_targets.end(), TimeComparator); |
STLDeleteValues(&target_map_); |