| OLD | NEW |
| 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 #ifndef MEDIA_MOJO_SERVICES_MOJO_MEDIA_APPLICATION_FACTORY_H_ | 5 #ifndef MEDIA_MOJO_SERVICES_MOJO_MEDIA_APPLICATION_FACTORY_H_ |
| 6 #define MEDIA_MOJO_SERVICES_MOJO_MEDIA_APPLICATION_FACTORY_H_ | 6 #define MEDIA_MOJO_SERVICES_MOJO_MEDIA_APPLICATION_FACTORY_H_ |
| 7 | 7 |
| 8 #include <memory> | 8 #include <memory> |
| 9 | 9 |
| 10 #include "services/shell/public/cpp/shell_client.h" | 10 #include "services/shell/public/cpp/shell_client.h" |
| 11 | 11 |
| 12 namespace media { | 12 namespace media { |
| 13 | 13 |
| 14 // Creates a MojoMediaApplication instance using the default MojoMediaClient. | 14 // Creates a MojoMediaApplication instance using the default MojoMediaClient. |
| 15 // Note: On Android AndroidmojoMediaApplication will be created with a null |
| 16 // MediaPermission. Use CreateAndroidMojoMediaApplication() below if |
| 17 // MediaPermission is needed. |
| 15 std::unique_ptr<shell::ShellClient> CreateMojoMediaApplication(); | 18 std::unique_ptr<shell::ShellClient> CreateMojoMediaApplication(); |
| 16 | 19 |
| 20 #if defined(OS_ANDROID) |
| 21 class MediaPermission; |
| 22 |
| 23 std::unique_ptr<::shell::ShellClient> CreateAndroidMojoMediaApplication( |
| 24 MediaPermission* media_permission); |
| 25 #endif |
| 26 |
| 17 } // namespace media | 27 } // namespace media |
| 18 | 28 |
| 19 #endif // MEDIA_MOJO_SERVICES_MOJO_MEDIA_APPLICATION_FACTORY_H_ | 29 #endif // MEDIA_MOJO_SERVICES_MOJO_MEDIA_APPLICATION_FACTORY_H_ |
| OLD | NEW |