| Index: content/public/common/content_client.h
|
| diff --git a/content/public/common/content_client.h b/content/public/common/content_client.h
|
| index d7b02300ec2111b213fb12d36fc46987b557ce2e..46f932a22b2fb63a96bef0a46ae39640a343e288 100644
|
| --- a/content/public/common/content_client.h
|
| +++ b/content/public/common/content_client.h
|
| @@ -34,6 +34,10 @@ namespace gpu {
|
| struct GPUInfo;
|
| }
|
|
|
| +namespace media {
|
| +class MediaClientAndroid;
|
| +}
|
| +
|
| namespace sandbox {
|
| class TargetPolicy;
|
| }
|
| @@ -158,6 +162,11 @@ class CONTENT_EXPORT ContentClient {
|
| // origin trials are not enabled in this context.
|
| virtual base::StringPiece GetOriginTrialPublicKey();
|
|
|
| +#if defined(OS_ANDROID)
|
| + // Returns the MediaClientAndroid to be used by media code on Android.
|
| + virtual media::MediaClientAndroid* GetMediaClientAndroid();
|
| +#endif // OS_ANDROID
|
| +
|
| private:
|
| friend class ContentClientInitializer; // To set these pointers.
|
| friend class InternalTestInitializer;
|
|
|