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

Unified Diff: chrome/browser/extensions/api/debugger/debugger_api.cc

Issue 25571005: DevTools: Never instantiate DevToolsAgentHost on threads other than UI (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 2 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: chrome/browser/extensions/api/debugger/debugger_api.cc
diff --git a/chrome/browser/extensions/api/debugger/debugger_api.cc b/chrome/browser/extensions/api/debugger/debugger_api.cc
index b2ca4c1a7a19ee68e9711cdc8895257b1be35457..32abf2ebe7a8c16fc6fcb06959781c1a2fe05a3a 100644
--- a/chrome/browser/extensions/api/debugger/debugger_api.cc
+++ b/chrome/browser/extensions/api/debugger/debugger_api.cc
@@ -761,24 +761,25 @@ bool DebuggerGetTargetsFunction::RunImpl() {
results_list->Append(value);
}
- content::BrowserThread::PostTaskAndReply(
+ content::BrowserThread::PostTaskAndReplyWithResult(
content::BrowserThread::IO,
FROM_HERE,
- base::Bind(&DebuggerGetTargetsFunction::CollectWorkerInfo, this,
- results_list),
+ base::Bind(&DebuggerGetTargetsFunction::CollectWorkerInfo, this),
base::Bind(&DebuggerGetTargetsFunction::SendTargetList, this,
results_list));
return true;
}
-void DebuggerGetTargetsFunction::CollectWorkerInfo(base::ListValue* list) {
- std::vector<WorkerService::WorkerInfo> worker_info =
- WorkerService::GetInstance()->GetWorkers();
- for (size_t i = 0; i < worker_info.size(); ++i)
- list->Append(SerializeWorkerInfo(worker_info[i]));
+DebuggerGetTargetsFunction::WorkerInfoList
+DebuggerGetTargetsFunction::CollectWorkerInfo() {
+ return WorkerService::GetInstance()->GetWorkers();
}
-void DebuggerGetTargetsFunction::SendTargetList(base::ListValue* list) {
+void DebuggerGetTargetsFunction::SendTargetList(
+ base::ListValue* list,
+ const WorkerInfoList& worker_info) {
+ for (size_t i = 0; i < worker_info.size(); ++i)
+ list->Append(SerializeWorkerInfo(worker_info[i]));
SetResult(list);
SendResponse(true);
}
« no previous file with comments | « chrome/browser/extensions/api/debugger/debugger_api.h ('k') | content/browser/devtools/devtools_agent_host_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698