| Index: media/base/android/media_player_bridge.h
|
| diff --git a/media/base/android/media_player_bridge.h b/media/base/android/media_player_bridge.h
|
| index ee56e281213039379236007f86e4d89018fa95af..4bad7f88f9268e779214e8f8801bc8c654d28cc5 100644
|
| --- a/media/base/android/media_player_bridge.h
|
| +++ b/media/base/android/media_player_bridge.h
|
| @@ -51,7 +51,9 @@ class MEDIA_EXPORT MediaPlayerBridge : public MediaPlayerAndroid {
|
| MediaPlayerManager* manager,
|
| const RequestMediaResourcesCB& request_media_resources_cb,
|
| const ReleaseMediaResourcesCB& release_media_resources_cb,
|
| - const GURL& frame_url);
|
| + const GURL& frame_url,
|
| + bool has_single_security_origin,
|
| + bool allow_credentials);
|
| virtual ~MediaPlayerBridge();
|
|
|
| // Initialize this object and extract the metadata from the media.
|
| @@ -86,6 +88,11 @@ class MEDIA_EXPORT MediaPlayerBridge : public MediaPlayerAndroid {
|
| void OnSeekComplete();
|
| void OnDidSetDataUriDataSource(JNIEnv* env, jobject obj, jboolean success);
|
|
|
| + virtual bool has_single_security_origin() const OVERRIDE {
|
| + return has_single_security_origin_;
|
| + }
|
| + virtual bool allow_credentials() const OVERRIDE { return allow_credentials_; }
|
| +
|
| protected:
|
| void SetJavaMediaPlayerBridge(jobject j_media_player_bridge);
|
| base::android::ScopedJavaLocalRef<jobject> GetJavaMediaPlayerBridge();
|
| @@ -186,6 +193,12 @@ class MEDIA_EXPORT MediaPlayerBridge : public MediaPlayerAndroid {
|
| // Volume of playback.
|
| double volume_;
|
|
|
| + // Whether the player should have a single security origin.
|
| + bool has_single_security_origin_;
|
| +
|
| + // Whether user credentials are allowed to be passed.
|
| + bool allow_credentials_;
|
| +
|
| // Weak pointer passed to |listener_| for callbacks.
|
| // NOTE: Weak pointers must be invalidated before all other member variables.
|
| base::WeakPtrFactory<MediaPlayerBridge> weak_factory_;
|
|
|