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

Unified Diff: content/shell/browser/shell_content_browser_client.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
Index: content/shell/browser/shell_content_browser_client.cc
diff --git a/content/shell/browser/shell_content_browser_client.cc b/content/shell/browser/shell_content_browser_client.cc
index f7219394dbdefcf16f270689a9435f2e49148f42..2057cdc842c136230b48f13cfbc95a2125c2b68c 100644
--- a/content/shell/browser/shell_content_browser_client.cc
+++ b/content/shell/browser/shell_content_browser_client.cc
@@ -180,8 +180,9 @@ bool ShellContentBrowserClient::IsHandledURL(const GURL& url) {
void ShellContentBrowserClient::RegisterInProcessMojoApplications(
StaticMojoApplicationMap* apps) {
#if (ENABLE_MOJO_MEDIA_IN_BROWSER_PROCESS)
- apps->insert(std::make_pair("mojo:media",
- base::Bind(&media::CreateMojoMediaApplication)));
+ content::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/public/utility/content_utility_client.h ('k') | content/shell/utility/shell_content_utility_client.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698