| 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)
|
|
|