content/renderer/media/crypto/proxy_media_keys.h - Issue 665563002: Add MediaKeys::GetCdmId().

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: content/renderer/media/crypto/proxy_media_keys.h

Issue 665563002: Add MediaKeys::GetCdmId(). (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git/+/master

Patch Set: Make GetCdmId() pure virtual. Created 6 years, 2 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

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