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

Side by Side Diff: media/mojo/services/mojo_media_application_factory.cc

Issue 1847823006: media: Fix gn deps on media/mojo/ targets. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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 unified diff | Download patch
« no previous file with comments | « media/mojo/services/BUILD.gn ('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 "media/mojo/services/mojo_media_application.h" 7 #include "media/mojo/services/mojo_media_application.h"
8 8
9 #if defined(ENABLE_TEST_MOJO_MEDIA_CLIENT) 9 #if defined(ENABLE_TEST_MOJO_MEDIA_CLIENT)
10 #include "media/mojo/services/test_mojo_media_client.h" 10 #include "media/mojo/services/test_mojo_media_client.h" // nogncheck
11 using DefaultClient = media::TestMojoMediaClient; 11 using DefaultClient = media::TestMojoMediaClient;
12 #elif defined(OS_ANDROID) 12 #elif defined(OS_ANDROID)
13 #include "media/mojo/services/android_mojo_media_client.h" 13 #include "media/mojo/services/android_mojo_media_client.h" // nogncheck
14 using DefaultClient = media::AndroidMojoMediaClient; 14 using DefaultClient = media::AndroidMojoMediaClient;
15 #else 15 #else
16 #include "media/mojo/services/default_mojo_media_client.h" 16 #include "media/mojo/services/default_mojo_media_client.h" // nogncheck
17 using DefaultClient = media::DefaultMojoMediaClient; 17 using DefaultClient = media::DefaultMojoMediaClient;
18 #endif 18 #endif
19 19
20 namespace media { 20 namespace media {
21 21
22 // static 22 // static
23 scoped_ptr<mojo::ShellClient> CreateMojoMediaApplication() { 23 scoped_ptr<mojo::ShellClient> CreateMojoMediaApplication() {
24 return scoped_ptr<mojo::ShellClient>( 24 return scoped_ptr<mojo::ShellClient>(
25 new MojoMediaApplication(make_scoped_ptr(new DefaultClient()))); 25 new MojoMediaApplication(make_scoped_ptr(new DefaultClient())));
26 } 26 }
27 27
28 } // namespace media 28 } // namespace media
OLDNEW
« no previous file with comments | « media/mojo/services/BUILD.gn ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698