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

Unified Diff: content/child/process_control_impl.cc

Issue 1947313002: Enable content embedders to specify mojo application task runner. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: restores mojo:media in browser Created 4 years, 7 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 | « content/child/process_control_impl.h ('k') | content/content_common.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/child/process_control_impl.cc
diff --git a/content/child/process_control_impl.cc b/content/child/process_control_impl.cc
index b465db6e94bc53d01cae229a8060b42b93825135..7a1e4d7211a107e68ef75e8359dc02592784c732 100644
--- a/content/child/process_control_impl.cc
+++ b/content/child/process_control_impl.cc
@@ -8,6 +8,7 @@
#include "base/bind.h"
#include "base/memory/ptr_util.h"
+#include "content/common/mojo/embedded_application_runner.h"
#include "content/public/common/content_client.h"
namespace content {
@@ -25,14 +26,15 @@ void ProcessControlImpl::LoadApplication(
// Only register apps on first run.
if (!has_registered_apps_) {
DCHECK(apps_.empty());
- ApplicationFactoryMap app_factories;
- RegisterApplicationFactories(&app_factories);
- for (const auto& factory : app_factories) {
+ ApplicationMap apps;
+ RegisterApplications(&apps);
+ for (const auto& app : apps) {
std::unique_ptr<EmbeddedApplicationRunner> runner(
- new EmbeddedApplicationRunner(factory.second, nullptr));
+ new EmbeddedApplicationRunner(app.second.application_factory,
+ app.second.application_task_runner));
runner->SetQuitClosure(base::Bind(&ProcessControlImpl::OnApplicationQuit,
base::Unretained(this)));
- apps_.insert(std::make_pair(factory.first, std::move(runner)));
+ apps_.insert(std::make_pair(app.first, std::move(runner)));
}
has_registered_apps_ = true;
}
« no previous file with comments | « content/child/process_control_impl.h ('k') | content/content_common.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698