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

Unified Diff: chrome/browser/icon_loader_chromeos.cc

Issue 2643333002: Convert USE_PROPRIETARY_CODECS to a buildflag header. (Closed)
Patch Set: Created 3 years, 11 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: chrome/browser/icon_loader_chromeos.cc
diff --git a/chrome/browser/icon_loader_chromeos.cc b/chrome/browser/icon_loader_chromeos.cc
index 71a1b46ac1d785f8b6733638bcb34194556b6949..35539fd35dddb1e5c0dec5cdef781a0ab31971fe 100644
--- a/chrome/browser/icon_loader_chromeos.cc
+++ b/chrome/browser/icon_loader_chromeos.cc
@@ -18,6 +18,7 @@
#include "base/message_loop/message_loop.h"
#include "base/strings/string_util.h"
#include "chrome/grit/theme_resources.h"
+#include "media/media_features.h"
#include "third_party/skia/include/core/SkBitmap.h"
#include "ui/base/layout.h"
#include "ui/base/resource/resource_bundle.h"
@@ -70,7 +71,7 @@ const IdrBySize kImageIdrs = {
IDR_FILETYPE_IMAGE,
IDR_FILETYPE_IMAGE
};
-#if defined(USE_PROPRIETARY_CODECS)
+#if BUILDFLAG(USE_PROPRIETARY_CODECS)
const IdrBySize kPdfIdrs = {
IDR_FILETYPE_PDF,
IDR_FILETYPE_PDF,
@@ -95,7 +96,7 @@ IconMapper::IconMapper() {
// 'video': /\.(mov|mp4|m4v|mpe?g4?|ogm|ogv|ogx|webm)$/i
const ExtensionIconMap::value_type kExtensionIdrBySizeData[] = {
-#if defined(USE_PROPRIETARY_CODECS)
+#if BUILDFLAG(USE_PROPRIETARY_CODECS)
std::make_pair(".m4a", kAudioIdrs),
std::make_pair(".mp3", kAudioIdrs),
std::make_pair(".pdf", kPdfIdrs),

Powered by Google App Engine
This is Rietveld 408576698