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

Unified Diff: chrome/browser/browser_about_handler.cc

Issue 2479593006: Move enable extensions define to a build flag. (Closed)
Patch Set: Merge Created 4 years, 1 month 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/browser_about_handler.cc
diff --git a/chrome/browser/browser_about_handler.cc b/chrome/browser/browser_about_handler.cc
index 30899a53a8e80f8df22ad8feaa40252a50c1c953..93e0d6a1fdfd5bac71e92ac10142190a6d664b70 100644
--- a/chrome/browser/browser_about_handler.cc
+++ b/chrome/browser/browser_about_handler.cc
@@ -20,6 +20,7 @@
#include "chrome/common/chrome_switches.h"
#include "chrome/common/url_constants.h"
#include "components/url_formatter/url_fixer.h"
+#include "extensions/features/features.h"
#if !defined(OS_ANDROID)
#include "chrome/browser/ui/webui/md_history_ui.h"
@@ -61,7 +62,7 @@ bool WillHandleBrowserAboutURL(GURL* url,
} else if (host == chrome::kChromeUISyncHost) {
host = chrome::kChromeUISyncInternalsHost;
// Redirect chrome://extensions.
-#if defined(ENABLE_EXTENSIONS)
+#if BUILDFLAG(ENABLE_EXTENSIONS)
} else if (host == chrome::kChromeUIExtensionsHost) {
// If the material design extensions page is enabled, it gets its own host.
// Otherwise, it's handled by the uber settings page.
@@ -77,7 +78,7 @@ bool WillHandleBrowserAboutURL(GURL* url,
url->path() == std::string("/") + chrome::kExtensionsSubPage) {
host = chrome::kChromeUIUberHost;
path = chrome::kChromeUIExtensionsHost;
-#endif // defined(ENABLE_EXTENSIONS)
+#endif // BUILDFLAG(ENABLE_EXTENSIONS)
// Redirect chrome://history.
} else if (host == chrome::kChromeUIHistoryHost) {
#if defined(OS_ANDROID)
« no previous file with comments | « chrome/browser/autocomplete/shortcuts_provider_extension_unittest.cc ('k') | chrome/browser/browser_process_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698