Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1923)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/common/chrome_content_client.cc

Issue 2411433002: Move ENABLE_PEPPER_CDMS to a buildflag header. (Closed)
Patch Set: fix 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:
View side-by-side diff with in-line comments
Download patch
« chrome/browser/media/encrypted_media_supported_types_browsertest.cc ('K') | « chrome/common/BUILD.gn ('k') | chrome/common/chrome_paths.cc » ('j') | third_party/widevine/cdm/widevine.gni » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments 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 616c9b15d2dfe692618f4e9fd7b24e3dc4e75d74..e7ffcd3f64882f089e7038d1db138dc3fa3eba21 100644
--- a/chrome/common/chrome_content_client.cc
+++ b/chrome/common/chrome_content_client.cc
@@ -47,6 +47,7 @@
#include "ui/base/l10n/l10n_util.h"
#include "ui/base/layout.h"
#include "ui/base/resource/resource_bundle.h"
+#include "third_party/widevine/cdm/cdm_features.h"
#include "widevine_cdm_version.h" // In SHARED_INTERMEDIATE_DIR.
#if defined(OS_LINUX)
@@ -76,7 +77,7 @@
#include "ppapi/shared_impl/ppapi_permissions.h"
#endif
-#if defined(WIDEVINE_CDM_AVAILABLE) && defined(ENABLE_PEPPER_CDMS) && \
+#if defined(WIDEVINE_CDM_AVAILABLE) && BUILDFLAG(ENABLE_PEPPER_CDMS) && \
!defined(WIDEVINE_CDM_IS_COMPONENT)
#define WIDEVINE_CDM_AVAILABLE_NOT_COMPONENT
#include "chrome/common/widevine_cdm_constants.h"
« chrome/browser/media/encrypted_media_supported_types_browsertest.cc ('K') | « chrome/common/BUILD.gn ('k') | chrome/common/chrome_paths.cc » ('j') | third_party/widevine/cdm/widevine.gni » ('J')

Powered by Google App Engine
This is Rietveld 408576698