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

Unified Diff: content/utility/utility_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/utility/utility_process_control_impl.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/utility/utility_process_control_impl.cc
diff --git a/content/utility/utility_process_control_impl.cc b/content/utility/utility_process_control_impl.cc
index f6f10f06412076ef8b39fdd1b394603b80642066..ea89450a40d31bf3b9c9971bb903531e798ceb31 100644
--- a/content/utility/utility_process_control_impl.cc
+++ b/content/utility/utility_process_control_impl.cc
@@ -20,16 +20,13 @@ UtilityProcessControlImpl::UtilityProcessControlImpl() {}
UtilityProcessControlImpl::~UtilityProcessControlImpl() {}
-void UtilityProcessControlImpl::RegisterApplicationFactories(
- ApplicationFactoryMap* factories) {
- ContentUtilityClient::StaticMojoApplicationMap apps;
- GetContentClient()->utility()->RegisterMojoApplications(&apps);
- for (const auto& entry : apps)
- factories->insert(std::make_pair(entry.first, entry.second));
+void UtilityProcessControlImpl::RegisterApplications(ApplicationMap* apps) {
+ GetContentClient()->utility()->RegisterMojoApplications(apps);
#if defined(ENABLE_MOJO_MEDIA_IN_UTILITY_PROCESS)
- factories->insert(std::make_pair(
- "mojo:media", base::Bind(&media::CreateMojoMediaApplication)));
+ MojoApplicationInfo app_info;
+ app_info.application_factory = base::Bind(&media::CreateMojoMediaApplication);
+ apps->insert(std::make_pair("mojo:media", app_info));
#endif
}
« no previous file with comments | « content/utility/utility_process_control_impl.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698