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

Unified Diff: chrome/browser/chrome_content_browser_client.cc

Issue 1544853003: Let content embedders register in-process media service. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 4 years, 11 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 | « chrome/browser/chrome_content_browser_client.h ('k') | content/browser/mojo/mojo_shell_context.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chrome_content_browser_client.cc
diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc
index 769938ceb7ad980bf1def0aa05ef054574d692c9..2a97ad5e3443b41ede4c834e04c6707e43c36a3f 100644
--- a/chrome/browser/chrome_content_browser_client.cc
+++ b/chrome/browser/chrome_content_browser_client.cc
@@ -294,6 +294,10 @@
#include "chrome/browser/chrome_browser_main_extra_parts_exo.h"
#endif
+#if defined(ENABLE_MOJO_MEDIA_IN_BROWSER_PROCESS)
+#include "media/mojo/services/mojo_media_application.h"
+#endif
+
using base::FileDescriptor;
using blink::WebWindowFeatures;
using content::AccessTokenStore;
@@ -2662,6 +2666,14 @@ void ChromeContentBrowserClient::RegisterRenderFrameMojoServices(
#endif // !defined(OS_ANDROID) && !defined(OS_IOS)
}
+void ChromeContentBrowserClient::RegisterInProcessMojoApplications(
+ StaticMojoApplicationMap* apps) {
+#if (ENABLE_MOJO_MEDIA_IN_BROWSER_PROCESS)
+ apps->insert(std::make_pair(
+ GURL("mojo:media"), base::Bind(&media::MojoMediaApplication::CreateApp)));
+#endif
+}
+
void ChromeContentBrowserClient::RegisterOutOfProcessMojoApplications(
OutOfProcessMojoApplicationMap* apps) {
#if defined(ENABLE_MOJO_MEDIA_IN_UTILITY_PROCESS)
« no previous file with comments | « chrome/browser/chrome_content_browser_client.h ('k') | content/browser/mojo/mojo_shell_context.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698