chrome/renderer/chrome_content_renderer_client.cc - Issue 772043004: Replace WIDEVINE_CDM_AVAILABLE with a gyp define 'enable_widevine_cdm'.

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 772043004: Replace WIDEVINE_CDM_AVAILABLE with a gyp define 'enable_widevine_cdm'. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 6 years ago

Use n/p to move between diff chunks; N/P to move between comments.

Jump to:

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

« chrome/browser/component_updater/widevine_cdm_component_installer.cc ('K') | « chrome/common/chrome_paths.cc ('k') | chrome/renderer/media/chrome_key_systems.cc » ('j') | chromecast/media/base/key_systems_common.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 c899e28c34f7451360228eefe35a41c1148c0b7d..168e959dd4bf88c749aaf2d6f817b50ccb7ea72c 100644

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

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

@@ -244,13 +244,13 @@ bool ShouldUseJavaScriptSettingForPlugin(const WebPluginInfo& plugin) {

return true;

#endif

-#if defined(WIDEVINE_CDM_AVAILABLE) && defined(ENABLE_PEPPER_CDMS)

+#if defined(ENABLE_WIDEVINE) && defined(ENABLE_PEPPER_CDMS)

// Treat CDM invocations like JavaScript.

if (plugin.name == ASCIIToUTF16(kWidevineCdmDisplayName)) {

DCHECK(plugin.type == WebPluginInfo::PLUGIN_TYPE_PEPPER_OUT_OF_PROCESS);

return true;

}

-#endif // defined(WIDEVINE_CDM_AVAILABLE) && defined(ENABLE_PEPPER_CDMS)

+#endif // defined(ENABLE_WIDEVINE) && defined(ENABLE_PEPPER_CDMS)

return false;

}