| Index: content/renderer/media/crypto/proxy_media_keys.h
|
| diff --git a/content/renderer/media/crypto/proxy_media_keys.h b/content/renderer/media/crypto/proxy_media_keys.h
|
| index bb08a5f7aaba31bc16728f342de691daf22271c5..6b4df648276dede03a675053766b5851502b414a 100644
|
| --- a/content/renderer/media/crypto/proxy_media_keys.h
|
| +++ b/content/renderer/media/crypto/proxy_media_keys.h
|
| @@ -64,6 +64,7 @@ class ProxyMediaKeys : public media::MediaKeys {
|
| virtual void GetUsableKeyIds(
|
| const std::string& web_session_id,
|
| scoped_ptr<media::KeyIdsPromise> promise) override;
|
| + virtual int GetCdmId() const override;
|
|
|
| // Callbacks.
|
| void OnSessionCreated(uint32 session_id, const std::string& web_session_id);
|
| @@ -76,8 +77,6 @@ class ProxyMediaKeys : public media::MediaKeys {
|
| media::MediaKeys::KeyError error_code,
|
| uint32 system_code);
|
|
|
| - int GetCdmId() const;
|
| -
|
| private:
|
| // The Android-specific code that handles sessions uses integer session ids
|
| // (basically a reference id), but media::MediaKeys bases everything on
|
|
|