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

Unified Diff: chrome/browser/extensions/component_extensions_whitelist/whitelist.cc

Issue 2406303003: Move enable_app_list to a buildflag. (Closed)
Patch Set: More grit defines 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
« no previous file with comments | « chrome/browser/chromeos/BUILD.gn ('k') | chrome/browser/extensions/component_loader.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/extensions/component_extensions_whitelist/whitelist.cc
diff --git a/chrome/browser/extensions/component_extensions_whitelist/whitelist.cc b/chrome/browser/extensions/component_extensions_whitelist/whitelist.cc
index 8e659145f607934149aa5c25c2c7a378b6ab2f6b..662dc94f1df091bf613c80c8df486e49404f0731 100644
--- a/chrome/browser/extensions/component_extensions_whitelist/whitelist.cc
+++ b/chrome/browser/extensions/component_extensions_whitelist/whitelist.cc
@@ -14,7 +14,7 @@
#include "chrome/grit/browser_resources.h"
#include "extensions/common/constants.h"
-#if defined(ENABLE_APP_LIST) && defined(OS_CHROMEOS)
+#if BUILDFLAG(ENABLE_APP_LIST) && defined(OS_CHROMEOS)
#include "chrome/browser/ui/app_list/google_now_extension.h"
#endif
@@ -48,7 +48,7 @@ bool IsComponentExtensionWhitelisted(const std::string& extension_id) {
return true;
}
-#if defined(ENABLE_APP_LIST) && defined(OS_CHROMEOS)
+#if BUILDFLAG(ENABLE_APP_LIST) && defined(OS_CHROMEOS)
std::string google_now_extension_id;
if (GetGoogleNowExtensionId(&google_now_extension_id) &&
google_now_extension_id == extension_id) {
@@ -72,7 +72,7 @@ bool IsComponentExtensionWhitelisted(int manifest_resource_id) {
switch (manifest_resource_id) {
// Please keep the list in alphabetical order.
case IDR_BOOKMARKS_MANIFEST:
-#if defined(ENABLE_APP_LIST)
+#if BUILDFLAG(ENABLE_APP_LIST)
case IDR_CHROME_APP_MANIFEST:
#endif
#if defined(ENABLE_PRINTING)
« no previous file with comments | « chrome/browser/chromeos/BUILD.gn ('k') | chrome/browser/extensions/component_loader.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698