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 f63d6268851797c4f1bc0ceeaba6c70d9c682763..190b8ad4d52ddbe461074bdb8ddff9f663ab9a9f 100644 |
--- a/media/base/android/media_player_bridge.h |
+++ b/media/base/android/media_player_bridge.h |
@@ -50,7 +50,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. |
@@ -85,6 +87,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(); |
@@ -180,6 +187,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_; |