| Index: media/mojo/services/mojo_media_application_factory.h
|
| diff --git a/media/mojo/services/mojo_media_application_factory.h b/media/mojo/services/mojo_media_application_factory.h
|
| index a2c6f59c766f684280f1abb8c3c280e898def4cb..627e2c15d69c9223b23be9d03a5752a33547fb73 100644
|
| --- a/media/mojo/services/mojo_media_application_factory.h
|
| +++ b/media/mojo/services/mojo_media_application_factory.h
|
| @@ -12,8 +12,18 @@
|
| namespace media {
|
|
|
| // Creates a MojoMediaApplication instance using the default MojoMediaClient.
|
| +// Note: On Android AndroidmojoMediaApplication will be created with a null
|
| +// MediaPermission. Use CreateAndroidMojoMediaApplication() below if
|
| +// MediaPermission is needed.
|
| std::unique_ptr<shell::ShellClient> CreateMojoMediaApplication();
|
|
|
| +#if defined(OS_ANDROID)
|
| +class MediaPermission;
|
| +
|
| +std::unique_ptr<::shell::ShellClient> CreateAndroidMojoMediaApplication(
|
| + MediaPermission* media_permission);
|
| +#endif
|
| +
|
| } // namespace media
|
|
|
| #endif // MEDIA_MOJO_SERVICES_MOJO_MEDIA_APPLICATION_FACTORY_H_
|
|
|