chrome/common/chrome_content_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/common/chrome_content_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. Draft comments are only viewable by you.

Jump to:

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

Download patch

« chrome/browser/component_updater/widevine_cdm_component_installer.cc ('K') | « chrome/browser/plugins/plugin_info_message_filter.cc ('k') | chrome/common/chrome_paths.cc » ('j') | chromecast/media/base/key_systems_common.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/common/chrome_content_client.cc

diff --git a/chrome/common/chrome_content_client.cc b/chrome/common/chrome_content_client.cc

index 581229c5d529b15065672c3b81cb61eace9c1c7d..95c9691484e742a1035a04a3b07f78fca8963c3a 100644

--- a/chrome/common/chrome_content_client.cc

+++ b/chrome/common/chrome_content_client.cc

@@ -61,7 +61,7 @@

#include "remoting/client/plugin/pepper_entrypoints.h"

#endif

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

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

!defined(WIDEVINE_CDM_IS_COMPONENT)

#include "chrome/common/widevine_cdm_constants.h"

#endif

@@ -252,7 +252,7 @@ void ComputeBuiltInPlugins(std::vector<content::PepperPluginInfo>* plugins) {

}

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

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

!defined(WIDEVINE_CDM_IS_COMPONENT)

static bool skip_widevine_cdm_file_check = false;

if (PathService::Get(chrome::FILE_WIDEVINE_CDM_ADAPTER, &path)) {

@@ -293,7 +293,7 @@ void ComputeBuiltInPlugins(std::vector<content::PepperPluginInfo>* plugins) {

skip_widevine_cdm_file_check = true;

}

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

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

// !defined(WIDEVINE_CDM_IS_COMPONENT)

// The Remoting Viewer plugin is built-in.