content/renderer/media/crypto/renderer_cdm_manager.h - Issue 1131753003: Plumb |use_secure_codecs| through to BrowserCdmFactoryAndroid.

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/renderer_cdm_manager.h

Issue 1131753003: Plumb |use_secure_codecs| through to BrowserCdmFactoryAndroid. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 5 years, 7 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:

View side-by-side diff with in-line comments

Download patch

« content/renderer/media/crypto/render_cdm_factory.cc ('K') | « content/renderer/media/crypto/render_cdm_factory.cc ('k') | content/renderer/media/crypto/renderer_cdm_manager.cc » ('j') | content/renderer/pepper/content_decryptor_delegate.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/renderer/media/crypto/renderer_cdm_manager.h

diff --git a/content/renderer/media/crypto/renderer_cdm_manager.h b/content/renderer/media/crypto/renderer_cdm_manager.h

index 9f5ec600ad3024ec82c51f637870cb48feed0b61..54aaff4b3fa186ad88d62f7c1b4a36eadad8bee7 100644

--- a/content/renderer/media/crypto/renderer_cdm_manager.h

+++ b/content/renderer/media/crypto/renderer_cdm_manager.h

@@ -19,6 +19,10 @@ namespace blink {

class WebFrame;

}

+namespace media {

+struct CdmConfig;

ddorwin 2015/05/13 06:03:20 ditto

sandersd (OOO until July 31) 2015/05/14 00:06:57 Done.

+} // namespace media

namespace content {

class ProxyMediaKeys;

@@ -38,7 +42,8 @@ class RendererCdmManager : public RenderFrameObserver {

uint32_t promise_id,

ProxyMediaKeys* media_keys,

const std::string& key_system,

- const GURL& security_origin);

+ const GURL& security_origin,

+ bool use_secure_codecs);

void SetServerCertificate(int cdm_id,

uint32_t promise_id,

const std::vector<uint8>& certificate);