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

Unified Diff: chrome/common/chrome_content_client.cc

Issue 2572883002: Convert USE_PROPRIETARY_CODECS to a buildflag header. (Closed)
Patch Set: Created 4 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
Index: chrome/common/chrome_content_client.cc
diff --git a/chrome/common/chrome_content_client.cc b/chrome/common/chrome_content_client.cc
index 20ba8876bd79e7d9d3672156011d40499d53f9f0..7bd1559ec1b5fb2b6582e94c1e41fa0aa7b57071 100644
--- a/chrome/common/chrome_content_client.cc
+++ b/chrome/common/chrome_content_client.cc
@@ -43,6 +43,7 @@
#include "extensions/common/constants.h"
#include "extensions/features/features.h"
#include "gpu/config/gpu_info.h"
+#include "media/media_features.h"
#include "net/http/http_util.h"
#include "ppapi/features/features.h"
#include "ui/base/l10n/l10n_util.h"
@@ -134,9 +135,9 @@ bool IsWidevineAvailable(base::FilePath* adapter_path,
// This list must match the CDM that is being bundled with Chrome.
codecs_supported->push_back(kCdmSupportedCodecVp8);
codecs_supported->push_back(kCdmSupportedCodecVp9);
-#if defined(USE_PROPRIETARY_CODECS)
+#if BUILDFLAG(USE_PROPRIETARY_CODECS)
codecs_supported->push_back(kCdmSupportedCodecAvc1);
-#endif // defined(USE_PROPRIETARY_CODECS)
+#endif // BUILDFLAG(USE_PROPRIETARY_CODECS)
return true;
}
}

Powered by Google App Engine
This is Rietveld 408576698