diff options
| author | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2015-10-13 13:24:50 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2015-10-14 10:57:25 +0000 |
| commit | af3d4809763ef308f08ced947a73b624729ac7ea (patch) | |
| tree | 4402b911e30383f6c6dace1e8cf3b8e85355db3a /chromium/media/blink/encrypted_media_player_support.h | |
| parent | 0e8ff63a407fe323e215bb1a2c423c09a4747c8a (diff) | |
| download | qtwebengine-chromium-af3d4809763ef308f08ced947a73b624729ac7ea.tar.gz | |
BASELINE: Update Chromium to 47.0.2526.14
Also adding in sources needed for spellchecking.
Change-Id: Idd44170fa1616f26315188970a8d5ba7d472b18a
Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
Diffstat (limited to 'chromium/media/blink/encrypted_media_player_support.h')
| -rw-r--r-- | chromium/media/blink/encrypted_media_player_support.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/chromium/media/blink/encrypted_media_player_support.h b/chromium/media/blink/encrypted_media_player_support.h index 6ddec23d511..2d09579c61b 100644 --- a/chromium/media/blink/encrypted_media_player_support.h +++ b/chromium/media/blink/encrypted_media_player_support.h @@ -22,7 +22,7 @@ namespace blink { class WebContentDecryptionModule; class WebLocalFrame; -class WebMediaPlayerClient; +class WebMediaPlayerEncryptedMediaClient; class WebString; } @@ -41,7 +41,7 @@ class EncryptedMediaPlayerSupport // |cdm_context_ready_cb| is called when the CDM instance creation completes. EncryptedMediaPlayerSupport(CdmFactory* cdm_factory, - blink::WebMediaPlayerClient* client, + blink::WebMediaPlayerEncryptedMediaClient* client, MediaPermission* media_permission, const CdmContextReadyCB& cdm_context_ready_cb); ~EncryptedMediaPlayerSupport(); @@ -95,7 +95,7 @@ class EncryptedMediaPlayerSupport CdmFactory* cdm_factory_; - blink::WebMediaPlayerClient* client_; + blink::WebMediaPlayerEncryptedMediaClient* client_; MediaPermission* media_permission_; |