Chromium Code Reviews| Index: content/renderer/media/android/webmediaplayer_android.h |
| diff --git a/content/renderer/media/android/webmediaplayer_android.h b/content/renderer/media/android/webmediaplayer_android.h |
| index 2ec857aef76322362fff330a60ce96e2476dba47..71924786539d41731637d269824bcb61fb833727 100644 |
| --- a/content/renderer/media/android/webmediaplayer_android.h |
| +++ b/content/renderer/media/android/webmediaplayer_android.h |
| @@ -249,14 +249,25 @@ class WebMediaPlayerAndroid : public blink::WebMediaPlayer, |
| void SetNeedsEstablishPeer(bool needs_establish_peer); |
| private: |
| - void InitializePlayer(int demuxer_client_id); |
| + void InitializePlayer(const GURL& url, |
| + const GURL& first_party_for_cookies, |
| + bool allowed_stored_credentials, |
| + int demuxer_client_id); |
| void Pause(bool is_media_related_action); |
| void DrawRemotePlaybackText(const std::string& remote_playback_message); |
| void ReallocateVideoFrame(); |
| void SetCurrentFrameInternal(scoped_refptr<media::VideoFrame>& frame); |
| - void DidLoadMediaInfo(MediaInfoLoader::Status status); |
| + void DidLoadMediaInfo(MediaInfoLoader::Status status, |
| + const GURL& redirected_url, |
| + const GURL& fist_party_for_cookies, |
|
palmer
2014/07/31 00:06:48
Make sure to fix this typo everywhere.
|
| + bool allow_stored_credentials); |
| bool IsKeySystemSupported(const std::string& key_system); |
| + // Helper method to check whether the media URL has a single security origin. |
| + // The returned value might be different from that of |
| + // hasSingleSecurityOrigin() as the latter is affected by OS limitations. |
| + bool HasSingleSecurityOriginInternal() const; |
| + |
| // Actually do the work for generateKeyRequest/addKey so they can easily |
| // report results to UMA. |
| MediaKeyException GenerateKeyRequestInternal(const std::string& key_system, |
| @@ -436,6 +447,9 @@ class WebMediaPlayerAndroid : public blink::WebMediaPlayer, |
| // player_manager_->SetCdm() directly. |
| media::DecryptorReadyCB decryptor_ready_cb_; |
| + // Whether stored credentials are allowed to be passed to the server. |
| + bool allow_stored_credentials_; |
| + |
| // NOTE: Weak pointers must be invalidated before all other member variables. |
| base::WeakPtrFactory<WebMediaPlayerAndroid> weak_factory_; |