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

Unified Diff: content/browser/browser_main_loop.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
Index: content/browser/browser_main_loop.cc
diff --git a/content/browser/browser_main_loop.cc b/content/browser/browser_main_loop.cc
index 325b85d3ec2686b68b642fcd1e2d759b1f156b79..0b0f947c80714e4c28a98a4cae916be52db69363 100644
--- a/content/browser/browser_main_loop.cc
+++ b/content/browser/browser_main_loop.cc
@@ -92,6 +92,7 @@
#include "skia/ext/event_tracer_impl.h"
#include "skia/ext/skia_memory_dump_provider.h"
#include "sql/sql_memory_dump_provider.h"
+#include "third_party/widevine/cdm/cdm_features.h"
#include "ui/base/clipboard/clipboard.h"
#if defined(USE_AURA) || defined(OS_MACOSX)
@@ -177,7 +178,7 @@
#include "content/browser/plugin_service_impl.h"
#endif
-#if defined(ENABLE_MOJO_CDM) && defined(ENABLE_PEPPER_CDMS)
+#if defined(ENABLE_MOJO_CDM) && BUILDFLAG(ENABLE_PEPPER_CDMS)
#include "content/browser/media/cdm_service_impl.h"
#endif
@@ -770,7 +771,7 @@ int BrowserMainLoop::PreCreateThreads() {
}
#endif
-#if defined(ENABLE_MOJO_CDM) && defined(ENABLE_PEPPER_CDMS)
+#if defined(ENABLE_MOJO_CDM) && BUILDFLAG(ENABLE_PEPPER_CDMS)
// Prior to any processing happening on the IO thread, we create the
// CDM service as it is predominantly used from the IO thread. This must
// be called on the main thread since it involves file path checks.

Powered by Google App Engine
This is Rietveld 408576698