chrome/renderer/chrome_content_renderer_client.cc - Issue 11414138: Encrypted Media: No NeedKey if --enable-encrypted-media is not set.

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: chrome/renderer/chrome_content_renderer_client.cc

Issue 11414138: Encrypted Media: No NeedKey if --enable-encrypted-media is not set. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master

Patch Set: Created 8 years, 1 month 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

« no previous file with comments | « chrome/renderer/chrome_content_renderer_client.h ('k') | chrome/renderer/prerender/prerender_webmediaplayer.h » ('j') | webkit/media/webmediaplayer_impl.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/renderer/chrome_content_renderer_client.cc

diff --git a/chrome/renderer/chrome_content_renderer_client.cc b/chrome/renderer/chrome_content_renderer_client.cc

index 5d18f651616fd37203fa47107697a850f523aac0..00cedac29b70fc6aa52e76a90cb49bb2f11f6c85 100644

--- a/chrome/renderer/chrome_content_renderer_client.cc

+++ b/chrome/renderer/chrome_content_renderer_client.cc

@@ -386,6 +386,7 @@ ChromeContentRendererClient::OverrideCreateWebMediaPlayer(

media::AudioRendererSink* audio_renderer_sink,

media::MessageLoopFactory* message_loop_factory,

webkit_media::MediaStreamClient* media_stream_client,

+ bool encrypted_media_enabled,

media::MediaLog* media_log) {

#if defined(OS_ANDROID)

// Chromium for Android doesn't support prerender yet.

@@ -396,7 +397,8 @@ ChromeContentRendererClient::OverrideCreateWebMediaPlayer(

return new prerender::PrerenderWebMediaPlayer(render_view, frame, client,

delegate, collection, audio_source_provider, audio_renderer_sink,

- message_loop_factory, media_stream_client, media_log);

+ message_loop_factory, media_stream_client, encrypted_media_enabled,

+ media_log);

#endif

}