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

Unified Diff: chrome/browser/about_flags.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
« no previous file with comments | « chrome/browser/DEPS ('k') | chrome/browser/autocomplete/autocomplete_classifier_factory.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/about_flags.cc
diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
index e21926d5842ed6633a9e805f8f69d27015f56b98..4b07b0dd688f0a8ca24a9d6766b475d4039cbf62 100644
--- a/chrome/browser/about_flags.cc
+++ b/chrome/browser/about_flags.cc
@@ -68,6 +68,7 @@
#include "content/public/common/content_switches.h"
#include "content/public/common/feature_h264_with_openh264_ffmpeg.h"
#include "content/public/common/features.h"
+#include "extensions/features/features.h"
#include "gin/public/gin_features.h"
#include "media/audio/audio_features.h"
#include "media/base/media_switches.h"
@@ -104,7 +105,7 @@
#include "ui/app_list/app_list_switches.h"
#endif // ENABLE_APP_LIST
-#if defined(ENABLE_EXTENSIONS)
+#if BUILDFLAG(ENABLE_EXTENSIONS)
#include "extensions/common/switches.h"
#endif // ENABLE_EXTENSIONS
@@ -721,7 +722,7 @@ const FeatureEntry kFeatureEntries[] = {
IDS_FLAGS_NACL_DEBUG_MASK_DESCRIPTION, kOsDesktop,
MULTI_VALUE_TYPE(kNaClDebugMaskChoices)},
#endif // DISABLE_NACL
-#if defined(ENABLE_EXTENSIONS)
+#if BUILDFLAG(ENABLE_EXTENSIONS)
{"extension-apis", IDS_FLAGS_EXPERIMENTAL_EXTENSION_APIS_NAME,
IDS_FLAGS_EXPERIMENTAL_EXTENSION_APIS_DESCRIPTION, kOsDesktop,
SINGLE_VALUE_TYPE(extensions::switches::kEnableExperimentalExtensionApis)},
@@ -732,7 +733,7 @@ const FeatureEntry kFeatureEntries[] = {
{"enable-fast-unload", IDS_FLAGS_FAST_UNLOAD_NAME,
IDS_FLAGS_FAST_UNLOAD_DESCRIPTION, kOsAll,
SINGLE_VALUE_TYPE(switches::kEnableFastUnload)},
-#if defined(ENABLE_EXTENSIONS)
+#if BUILDFLAG(ENABLE_EXTENSIONS)
{"enable-app-window-controls", IDS_FLAGS_APP_WINDOW_CONTROLS_NAME,
IDS_FLAGS_APP_WINDOW_CONTROLS_DESCRIPTION, kOsDesktop,
SINGLE_VALUE_TYPE(extensions::switches::kEnableAppWindowControls)},
@@ -830,7 +831,7 @@ const FeatureEntry kFeatureEntries[] = {
IDS_FLAGS_EXPERIMENTAL_WEB_PLATFORM_FEATURES_NAME,
IDS_FLAGS_EXPERIMENTAL_WEB_PLATFORM_FEATURES_DESCRIPTION, kOsAll,
SINGLE_VALUE_TYPE(switches::kEnableExperimentalWebPlatformFeatures)},
-#if defined(ENABLE_EXTENSIONS)
+#if BUILDFLAG(ENABLE_EXTENSIONS)
{"enable-ble-advertising-in-apps",
IDS_FLAGS_BLE_ADVERTISING_IN_EXTENSIONS_NAME,
IDS_FLAGS_BLE_ADVERTISING_IN_EXTENSIONS_DESCRIPTION, kOsCrOS,
@@ -1310,7 +1311,7 @@ const FeatureEntry kFeatureEntries[] = {
SINGLE_DISABLE_VALUE_TYPE(
views::switches::kDisableViewsRectBasedTargeting)},
#endif // TOOLKIT_VIEWS
-#if defined(ENABLE_EXTENSIONS)
+#if BUILDFLAG(ENABLE_EXTENSIONS)
{"enable-apps-show-on-first-paint", IDS_FLAGS_APPS_SHOW_ON_FIRST_PAINT_NAME,
IDS_FLAGS_APPS_SHOW_ON_FIRST_PAINT_DESCRIPTION, kOsDesktop,
SINGLE_VALUE_TYPE(extensions::switches::kEnableAppsShowOnFirstPaint)},
@@ -1381,7 +1382,7 @@ const FeatureEntry kFeatureEntries[] = {
IDS_FLAGS_EXTENSION_CONTENT_VERIFICATION_NAME,
IDS_FLAGS_EXTENSION_CONTENT_VERIFICATION_DESCRIPTION, kOsDesktop,
MULTI_VALUE_TYPE(kExtensionContentVerificationChoices)},
-#if defined(ENABLE_EXTENSIONS)
+#if BUILDFLAG(ENABLE_EXTENSIONS)
{"extension-active-script-permission",
IDS_FLAGS_USER_CONSENT_FOR_EXTENSION_SCRIPTS_NAME,
IDS_FLAGS_USER_CONSENT_FOR_EXTENSION_SCRIPTS_DESCRIPTION, kOsAll,
@@ -1397,7 +1398,7 @@ const FeatureEntry kFeatureEntries[] = {
{"enable-hotword-hardware", IDS_FLAGS_EXPERIMENTAL_HOTWORD_HARDWARE_NAME,
IDS_FLAGS_EXPERIMENTAL_HOTWORD_HARDWARE_DESCRIPTION, kOsCrOS,
SINGLE_VALUE_TYPE(switches::kEnableExperimentalHotwordHardware)},
-#if defined(ENABLE_EXTENSIONS)
+#if BUILDFLAG(ENABLE_EXTENSIONS)
{"enable-embedded-extension-options",
IDS_FLAGS_EMBEDDED_EXTENSION_OPTIONS_NAME,
IDS_FLAGS_EMBEDDED_EXTENSION_OPTIONS_DESCRIPTION, kOsDesktop,
@@ -1411,7 +1412,7 @@ const FeatureEntry kFeatureEntries[] = {
{"drop-sync-credential", IDS_FLAGS_DROP_SYNC_CREDENTIAL_NAME,
IDS_FLAGS_DROP_SYNC_CREDENTIAL_DESCRIPTION, kOsAll,
FEATURE_VALUE_TYPE(password_manager::features::kDropSyncCredential)},
-#if defined(ENABLE_EXTENSIONS)
+#if BUILDFLAG(ENABLE_EXTENSIONS)
{"enable-extension-action-redesign",
IDS_FLAGS_EXTENSION_ACTION_REDESIGN_NAME,
IDS_FLAGS_EXTENSION_ACTION_REDESIGN_DESCRIPTION, kOsDesktop,
@@ -1764,7 +1765,7 @@ const FeatureEntry kFeatureEntries[] = {
{"force-ui-direction", IDS_FLAGS_FORCE_UI_DIRECTION_NAME,
IDS_FLAGS_FORCE_UI_DIRECTION_DESCRIPTION, kOsAll,
MULTI_VALUE_TYPE(kForceUIDirectionChoices)},
-#if defined(ENABLE_EXTENSIONS)
+#if BUILDFLAG(ENABLE_EXTENSIONS)
{"enable-md-extensions", IDS_FLAGS_ENABLE_MATERIAL_DESIGN_EXTENSIONS_NAME,
IDS_FLAGS_ENABLE_MATERIAL_DESIGN_EXTENSIONS_DESCRIPTION, kOsDesktop,
FEATURE_VALUE_TYPE(features::kMaterialDesignExtensions)},
@@ -1837,7 +1838,7 @@ const FeatureEntry kFeatureEntries[] = {
IDS_FLAG_DISABLE_AUDIO_FOR_DESKTOP_SHARE,
IDS_FLAG_DISABLE_AUDIO_FOR_DESKTOP_SHARE_DESCRIPTION, kOsAll,
SINGLE_VALUE_TYPE(switches::kDisableAudioSupportForDesktopShare)},
-#if defined(ENABLE_EXTENSIONS)
+#if BUILDFLAG(ENABLE_EXTENSIONS)
{"tab-for-desktop-share", IDS_FLAG_DISABLE_TAB_FOR_DESKTOP_SHARE,
IDS_FLAG_DISABLE_TAB_FOR_DESKTOP_SHARE_DESCRIPTION, kOsAll,
SINGLE_VALUE_TYPE(extensions::switches::kDisableTabForDesktopShare)},
« no previous file with comments | « chrome/browser/DEPS ('k') | chrome/browser/autocomplete/autocomplete_classifier_factory.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698