chrome/common/chrome_content_client.cc - Issue 2412493003: Revert of Move ENABLE_PEPPER_CDMS to a buildflag header.

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 2412493003: Revert of Move ENABLE_PEPPER_CDMS to a buildflag header. (Closed)

Patch Set: Created 4 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: chrome/common/chrome_content_client.cc

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

index 675355fcb1c9d33b947d26089f484e04eee1a518..616c9b15d2dfe692618f4e9fd7b24e3dc4e75d74 100644

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

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

@@ -44,7 +44,6 @@

#include "extensions/common/constants.h"

#include "gpu/config/gpu_info.h"

#include "net/http/http_util.h"

-#include "ppapi/features/features.h"

#include "ui/base/l10n/l10n_util.h"

#include "ui/base/layout.h"

#include "ui/base/resource/resource_bundle.h"

@@ -77,7 +76,7 @@

#include "ppapi/shared_impl/ppapi_permissions.h"

#endif

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

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

!defined(WIDEVINE_CDM_IS_COMPONENT)

#define WIDEVINE_CDM_AVAILABLE_NOT_COMPONENT

#include "chrome/common/widevine_cdm_constants.h"

« no previous file with comments | « chrome/common/BUILD.gn ('k') | chrome/common/chrome_paths.cc » ('j') | no next file with comments »