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

Unified Diff: media/mojo/services/mojo_media_application_factory.cc

Issue 1837143002: media: Pass MediaPermission to MediaDrmBridge Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: More plumbing Created 4 years, 8 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 | « media/mojo/services/mojo_media_application_factory.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/mojo/services/mojo_media_application_factory.cc
diff --git a/media/mojo/services/mojo_media_application_factory.cc b/media/mojo/services/mojo_media_application_factory.cc
index aded2c67a68e2ebdc3d6092c96ac5300a0907119..06e38b699eab137ec0d8df66b7e61f9eba4542b4 100644
--- a/media/mojo/services/mojo_media_application_factory.cc
+++ b/media/mojo/services/mojo_media_application_factory.cc
@@ -22,8 +22,17 @@ namespace media {
// static
std::unique_ptr<shell::ShellClient> CreateMojoMediaApplication() {
- return std::unique_ptr<shell::ShellClient>(
+ return base::WrapUnique(
new MojoMediaApplication(base::WrapUnique(new DefaultClient())));
}
+#if defined(OS_ANDROID)
+// static
+std::unique_ptr<::shell::ShellClient> CreateAndroidMojoMediaApplication(
+ media::MediaPermission* media_permission) {
+ return base::WrapUnique(new media::MojoMediaApplication(
+ base::WrapUnique(new media::AndroidMojoMediaClient(media_permission))));
+}
+#endif
+
} // namespace media
« no previous file with comments | « media/mojo/services/mojo_media_application_factory.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698