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

Side by Side 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, 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 unified diff | Download patch
« no previous file with comments | « media/mojo/services/mojo_media_application_factory.h ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "media/mojo/services/mojo_media_application_factory.h" 5 #include "media/mojo/services/mojo_media_application_factory.h"
6 6
7 #include "base/memory/ptr_util.h" 7 #include "base/memory/ptr_util.h"
8 #include "media/mojo/services/mojo_media_application.h" 8 #include "media/mojo/services/mojo_media_application.h"
9 9
10 #if defined(ENABLE_TEST_MOJO_MEDIA_CLIENT) 10 #if defined(ENABLE_TEST_MOJO_MEDIA_CLIENT)
11 #include "media/mojo/services/test_mojo_media_client.h" // nogncheck 11 #include "media/mojo/services/test_mojo_media_client.h" // nogncheck
12 using DefaultClient = media::TestMojoMediaClient; 12 using DefaultClient = media::TestMojoMediaClient;
13 #elif defined(OS_ANDROID) 13 #elif defined(OS_ANDROID)
14 #include "media/mojo/services/android_mojo_media_client.h" // nogncheck 14 #include "media/mojo/services/android_mojo_media_client.h" // nogncheck
15 using DefaultClient = media::AndroidMojoMediaClient; 15 using DefaultClient = media::AndroidMojoMediaClient;
16 #else 16 #else
17 #include "media/mojo/services/default_mojo_media_client.h" // nogncheck 17 #include "media/mojo/services/default_mojo_media_client.h" // nogncheck
18 using DefaultClient = media::DefaultMojoMediaClient; 18 using DefaultClient = media::DefaultMojoMediaClient;
19 #endif 19 #endif
20 20
21 namespace media { 21 namespace media {
22 22
23 // static 23 // static
24 std::unique_ptr<shell::ShellClient> CreateMojoMediaApplication() { 24 std::unique_ptr<shell::ShellClient> CreateMojoMediaApplication() {
25 return std::unique_ptr<shell::ShellClient>( 25 return base::WrapUnique(
26 new MojoMediaApplication(base::WrapUnique(new DefaultClient()))); 26 new MojoMediaApplication(base::WrapUnique(new DefaultClient())));
27 } 27 }
28 28
29 #if defined(OS_ANDROID)
30 // static
31 std::unique_ptr<::shell::ShellClient> CreateAndroidMojoMediaApplication(
32 media::MediaPermission* media_permission) {
33 return base::WrapUnique(new media::MojoMediaApplication(
34 base::WrapUnique(new media::AndroidMojoMediaClient(media_permission))));
35 }
36 #endif
37
29 } // namespace media 38 } // namespace media
OLDNEW
« 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