diff options
| author | xhwang <xhwang@chromium.org> | 2015-01-31 21:20:46 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-02-01 05:21:45 +0000 |
| commit | 60b430a11d662a93795cef0fd137cb7018172ab9 (patch) | |
| tree | b392babb6d1b234867be9a6b24b60931df56740f /content/renderer/render_frame_impl.h | |
| parent | 18493ebe8d788acb9be1a03f2af791d9c3eebd38 (diff) | |
| download | chromium_src-60b430a11d662a93795cef0fd137cb7018172ab9.zip chromium_src-60b430a11d662a93795cef0fd137cb7018172ab9.tar.gz chromium_src-60b430a11d662a93795cef0fd137cb7018172ab9.tar.bz2 | |
media: Add DefaultMediaPermission.
Also pass MediaPermission to ProxyDecryptor, in preparation for triggering
user prompt from ProxyDecryptor for prefixed EME implementation.
TBR=jam@chromium.org,aa@chromium.org
BUG=446263
Review URL: https://codereview.chromium.org/887873003
Cr-Commit-Position: refs/heads/master@{#314082}
Diffstat (limited to 'content/renderer/render_frame_impl.h')
| -rw-r--r-- | content/renderer/render_frame_impl.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/content/renderer/render_frame_impl.h b/content/renderer/render_frame_impl.h index 3878067..f387e4f 100644 --- a/content/renderer/render_frame_impl.h +++ b/content/renderer/render_frame_impl.h @@ -68,6 +68,7 @@ class Rect; } namespace media { +class MediaPermission; class WebEncryptedMediaClientImpl; } @@ -720,6 +721,7 @@ class CONTENT_EXPORT RenderFrameImpl blink::WebMediaPlayer* CreateAndroidWebMediaPlayer( const blink::WebURL& url, blink::WebMediaPlayerClient* client, + media::MediaPermission* media_permission, blink::WebContentDecryptionModule* initial_cdm); RendererMediaPlayerManager* GetMediaPlayerManager(); |