Chromium Code Reviews| Index: chrome/browser/about_flags.cc |
| diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc |
| index 8c96baaaf3a57b4c74d721844b4eb4242e9f5950..785acaf0fb606d20a73e7b400c76483e54d3b889 100644 |
| --- a/chrome/browser/about_flags.cc |
| +++ b/chrome/browser/about_flags.cc |
| @@ -527,133 +527,93 @@ const FeatureEntry::Choice kNtpSwitchToExistingTabChoices[] = { |
| // |
| // When adding a new choice, add it to the end of the list. |
| const FeatureEntry kFeatureEntries[] = { |
| - {"ignore-gpu-blacklist", |
|
dcheng
2015/12/21 23:44:23
I know there's been a lot of debate whether or not
Evan Stade
2015/12/21 23:50:15
oops..
|
| - IDS_FLAGS_IGNORE_GPU_BLACKLIST_NAME, |
| - IDS_FLAGS_IGNORE_GPU_BLACKLIST_DESCRIPTION, |
| - kOsAll, |
| + {"ignore-gpu-blacklist", IDS_FLAGS_IGNORE_GPU_BLACKLIST_NAME, |
| + IDS_FLAGS_IGNORE_GPU_BLACKLIST_DESCRIPTION, kOsAll, |
| SINGLE_VALUE_TYPE(switches::kIgnoreGpuBlacklist)}, |
| #if defined(OS_WIN) |
| - {"disable-direct-write", |
| - IDS_FLAGS_DIRECT_WRITE_NAME, |
| - IDS_FLAGS_DIRECT_WRITE_DESCRIPTION, |
| - kOsWin, |
| + {"disable-direct-write", IDS_FLAGS_DIRECT_WRITE_NAME, |
| + IDS_FLAGS_DIRECT_WRITE_DESCRIPTION, kOsWin, |
| SINGLE_DISABLE_VALUE_TYPE(switches::kDisableDirectWrite)}, |
| #endif |
| {"enable-experimental-canvas-features", |
| IDS_FLAGS_EXPERIMENTAL_CANVAS_FEATURES_NAME, |
| - IDS_FLAGS_EXPERIMENTAL_CANVAS_FEATURES_DESCRIPTION, |
| - kOsAll, |
| + IDS_FLAGS_EXPERIMENTAL_CANVAS_FEATURES_DESCRIPTION, kOsAll, |
| SINGLE_VALUE_TYPE(switches::kEnableExperimentalCanvasFeatures)}, |
| - {"disable-accelerated-2d-canvas", |
| - IDS_FLAGS_ACCELERATED_2D_CANVAS_NAME, |
| - IDS_FLAGS_ACCELERATED_2D_CANVAS_DESCRIPTION, |
| - kOsAll, |
| + {"disable-accelerated-2d-canvas", IDS_FLAGS_ACCELERATED_2D_CANVAS_NAME, |
| + IDS_FLAGS_ACCELERATED_2D_CANVAS_DESCRIPTION, kOsAll, |
| SINGLE_DISABLE_VALUE_TYPE(switches::kDisableAccelerated2dCanvas)}, |
| - {"enable-display-list-2d-canvas", |
| - IDS_FLAGS_DISPLAY_LIST_2D_CANVAS_NAME, |
| - IDS_FLAGS_DISPLAY_LIST_2D_CANVAS_DESCRIPTION, |
| - kOsAll, |
| + {"enable-display-list-2d-canvas", IDS_FLAGS_DISPLAY_LIST_2D_CANVAS_NAME, |
| + IDS_FLAGS_DISPLAY_LIST_2D_CANVAS_DESCRIPTION, kOsAll, |
| ENABLE_DISABLE_VALUE_TYPE(switches::kEnableDisplayList2dCanvas, |
| switches::kDisableDisplayList2dCanvas)}, |
| - {"composited-layer-borders", |
| - IDS_FLAGS_COMPOSITED_LAYER_BORDERS, |
| - IDS_FLAGS_COMPOSITED_LAYER_BORDERS_DESCRIPTION, |
| - kOsAll, |
| + {"composited-layer-borders", IDS_FLAGS_COMPOSITED_LAYER_BORDERS, |
| + IDS_FLAGS_COMPOSITED_LAYER_BORDERS_DESCRIPTION, kOsAll, |
| SINGLE_VALUE_TYPE(cc::switches::kShowCompositedLayerBorders)}, |
| #if defined(ENABLE_WEBRTC) |
| - {"disable-webrtc-hw-decoding", |
| - IDS_FLAGS_WEBRTC_HW_DECODING_NAME, |
| - IDS_FLAGS_WEBRTC_HW_DECODING_DESCRIPTION, |
| - kOsAndroid | kOsCrOS, |
| + {"disable-webrtc-hw-decoding", IDS_FLAGS_WEBRTC_HW_DECODING_NAME, |
| + IDS_FLAGS_WEBRTC_HW_DECODING_DESCRIPTION, kOsAndroid | kOsCrOS, |
| SINGLE_DISABLE_VALUE_TYPE(switches::kDisableWebRtcHWDecoding)}, |
| - {"disable-webrtc-hw-encoding", |
| - IDS_FLAGS_WEBRTC_HW_ENCODING_NAME, |
| - IDS_FLAGS_WEBRTC_HW_ENCODING_DESCRIPTION, |
| - kOsAndroid | kOsCrOS, |
| + {"disable-webrtc-hw-encoding", IDS_FLAGS_WEBRTC_HW_ENCODING_NAME, |
| + IDS_FLAGS_WEBRTC_HW_ENCODING_DESCRIPTION, kOsAndroid | kOsCrOS, |
| SINGLE_DISABLE_VALUE_TYPE(switches::kDisableWebRtcHWEncoding)}, |
| - {"enable-webrtc-stun-origin", |
| - IDS_FLAGS_WEBRTC_STUN_ORIGIN_NAME, |
| - IDS_FLAGS_WEBRTC_STUN_ORIGIN_DESCRIPTION, |
| - kOsAll, |
| + {"enable-webrtc-stun-origin", IDS_FLAGS_WEBRTC_STUN_ORIGIN_NAME, |
| + IDS_FLAGS_WEBRTC_STUN_ORIGIN_DESCRIPTION, kOsAll, |
| SINGLE_VALUE_TYPE(switches::kEnableWebRtcStunOrigin)}, |
| #endif |
| #if defined(OS_ANDROID) |
| - {"disable-webaudio", |
| - IDS_FLAGS_WEBAUDIO_NAME, |
| - IDS_FLAGS_WEBAUDIO_DESCRIPTION, |
| - kOsAndroid, |
| + {"disable-webaudio", IDS_FLAGS_WEBAUDIO_NAME, |
| + IDS_FLAGS_WEBAUDIO_DESCRIPTION, kOsAndroid, |
| SINGLE_DISABLE_VALUE_TYPE(switches::kDisableWebAudio)}, |
| #endif |
| // Native client is compiled out when DISABLE_NACL is defined. |
| #if !defined(DISABLE_NACL) |
| {"enable-nacl", // FLAGS:RECORD_UMA |
| - IDS_FLAGS_NACL_NAME, |
| - IDS_FLAGS_NACL_DESCRIPTION, |
| - kOsAll, |
| + IDS_FLAGS_NACL_NAME, IDS_FLAGS_NACL_DESCRIPTION, kOsAll, |
| SINGLE_VALUE_TYPE(switches::kEnableNaCl)}, |
| {"enable-nacl-debug", // FLAGS:RECORD_UMA |
| - IDS_FLAGS_NACL_DEBUG_NAME, |
| - IDS_FLAGS_NACL_DEBUG_DESCRIPTION, |
| - kOsDesktop, |
| + IDS_FLAGS_NACL_DEBUG_NAME, IDS_FLAGS_NACL_DEBUG_DESCRIPTION, kOsDesktop, |
| SINGLE_VALUE_TYPE(switches::kEnableNaClDebug)}, |
| {"nacl-debug-mask", // FLAGS:RECORD_UMA |
| - IDS_FLAGS_NACL_DEBUG_MASK_NAME, |
| - IDS_FLAGS_NACL_DEBUG_MASK_DESCRIPTION, |
| - kOsDesktop, |
| - MULTI_VALUE_TYPE(kNaClDebugMaskChoices)}, |
| + IDS_FLAGS_NACL_DEBUG_MASK_NAME, IDS_FLAGS_NACL_DEBUG_MASK_DESCRIPTION, |
| + kOsDesktop, MULTI_VALUE_TYPE(kNaClDebugMaskChoices)}, |
| #endif |
| #if defined(ENABLE_EXTENSIONS) |
| {"extension-apis", // FLAGS:RECORD_UMA |
| IDS_FLAGS_EXPERIMENTAL_EXTENSION_APIS_NAME, |
| - IDS_FLAGS_EXPERIMENTAL_EXTENSION_APIS_DESCRIPTION, |
| - kOsDesktop, |
| + IDS_FLAGS_EXPERIMENTAL_EXTENSION_APIS_DESCRIPTION, kOsDesktop, |
| SINGLE_VALUE_TYPE(extensions::switches::kEnableExperimentalExtensionApis)}, |
| - {"extensions-on-chrome-urls", |
| - IDS_FLAGS_EXTENSIONS_ON_CHROME_URLS_NAME, |
| - IDS_FLAGS_EXTENSIONS_ON_CHROME_URLS_DESCRIPTION, |
| - kOsAll, |
| + {"extensions-on-chrome-urls", IDS_FLAGS_EXTENSIONS_ON_CHROME_URLS_NAME, |
| + IDS_FLAGS_EXTENSIONS_ON_CHROME_URLS_DESCRIPTION, kOsAll, |
| SINGLE_VALUE_TYPE(extensions::switches::kExtensionsOnChromeURLs)}, |
| #endif |
| - {"enable-fast-unload", |
| - IDS_FLAGS_FAST_UNLOAD_NAME, |
| - IDS_FLAGS_FAST_UNLOAD_DESCRIPTION, |
| - kOsAll, |
| + {"enable-fast-unload", IDS_FLAGS_FAST_UNLOAD_NAME, |
| + IDS_FLAGS_FAST_UNLOAD_DESCRIPTION, kOsAll, |
| SINGLE_VALUE_TYPE(switches::kEnableFastUnload)}, |
| #if defined(ENABLE_EXTENSIONS) |
| - {"enable-app-window-controls", |
| - IDS_FLAGS_APP_WINDOW_CONTROLS_NAME, |
| - IDS_FLAGS_APP_WINDOW_CONTROLS_DESCRIPTION, |
| - kOsDesktop, |
| + {"enable-app-window-controls", IDS_FLAGS_APP_WINDOW_CONTROLS_NAME, |
| + IDS_FLAGS_APP_WINDOW_CONTROLS_DESCRIPTION, kOsDesktop, |
| SINGLE_VALUE_TYPE(extensions::switches::kEnableAppWindowControls)}, |
| #endif |
| - {"disable-hyperlink-auditing", |
| - IDS_FLAGS_HYPERLINK_AUDITING_NAME, |
| - IDS_FLAGS_HYPERLINK_AUDITING_DESCRIPTION, |
| - kOsAll, |
| + {"disable-hyperlink-auditing", IDS_FLAGS_HYPERLINK_AUDITING_NAME, |
| + IDS_FLAGS_HYPERLINK_AUDITING_DESCRIPTION, kOsAll, |
| SINGLE_DISABLE_VALUE_TYPE(switches::kNoPings)}, |
| #if defined(OS_ANDROID) |
| - {"contextual-search", |
| - IDS_FLAGS_CONTEXTUAL_SEARCH, |
| - IDS_FLAGS_CONTEXTUAL_SEARCH_DESCRIPTION, |
| - kOsAndroid, |
| + {"contextual-search", IDS_FLAGS_CONTEXTUAL_SEARCH, |
| + IDS_FLAGS_CONTEXTUAL_SEARCH_DESCRIPTION, kOsAndroid, |
| ENABLE_DISABLE_VALUE_TYPE(switches::kEnableContextualSearch, |
| switches::kDisableContextualSearch)}, |
| #endif |
| {"show-autofill-type-predictions", |
| IDS_FLAGS_SHOW_AUTOFILL_TYPE_PREDICTIONS_NAME, |
| - IDS_FLAGS_SHOW_AUTOFILL_TYPE_PREDICTIONS_DESCRIPTION, |
| - kOsAll, |
| + IDS_FLAGS_SHOW_AUTOFILL_TYPE_PREDICTIONS_DESCRIPTION, kOsAll, |
| SINGLE_VALUE_TYPE(autofill::switches::kShowAutofillTypePredictions)}, |
| {"enable-smooth-scrolling", // FLAGS:RECORD_UMA |
| - IDS_FLAGS_SMOOTH_SCROLLING_NAME, |
| - IDS_FLAGS_SMOOTH_SCROLLING_DESCRIPTION, |
| + IDS_FLAGS_SMOOTH_SCROLLING_NAME, IDS_FLAGS_SMOOTH_SCROLLING_DESCRIPTION, |
| // Can't expose the switch unless the code is compiled in. |
| // On by default for the Mac (different implementation in WebKit). |
| - kOsLinux | kOsWin, |
| - SINGLE_VALUE_TYPE(switches::kEnableSmoothScrolling)}, |
| + kOsLinux | kOsWin, SINGLE_VALUE_TYPE(switches::kEnableSmoothScrolling)}, |
| #if defined(USE_AURA) || defined(OS_LINUX) |
| - {"overlay-scrollbars", |
| - IDS_FLAGS_OVERLAY_SCROLLBARS_NAME, |
| + {"overlay-scrollbars", IDS_FLAGS_OVERLAY_SCROLLBARS_NAME, |
| IDS_FLAGS_OVERLAY_SCROLLBARS_DESCRIPTION, |
| // Uses the system preference on Mac (a different implementation). |
| // On Android, this is always enabled. |
| @@ -661,54 +621,36 @@ const FeatureEntry kFeatureEntries[] = { |
| ENABLE_DISABLE_VALUE_TYPE(switches::kEnableOverlayScrollbar, |
| switches::kDisableOverlayScrollbar)}, |
| #endif |
| - {"enable-panels", |
| - IDS_FLAGS_PANELS_NAME, |
| - IDS_FLAGS_PANELS_DESCRIPTION, |
| - kOsDesktop, |
| - SINGLE_VALUE_TYPE(switches::kEnablePanels)}, |
| + {"enable-panels", IDS_FLAGS_PANELS_NAME, IDS_FLAGS_PANELS_DESCRIPTION, |
| + kOsDesktop, ENABLE_DISABLE_VALUE_TYPE(switches::kEnablePanels, |
| + switches::kDisablePanels)}, |
| {// See http://crbug.com/120416 for how to remove this flag. |
| "save-page-as-mhtml", // FLAGS:RECORD_UMA |
| IDS_FLAGS_SAVE_PAGE_AS_MHTML_NAME, |
| - IDS_FLAGS_SAVE_PAGE_AS_MHTML_DESCRIPTION, |
| - kOsMac | kOsWin | kOsLinux, |
| + IDS_FLAGS_SAVE_PAGE_AS_MHTML_DESCRIPTION, kOsMac | kOsWin | kOsLinux, |
| SINGLE_VALUE_TYPE(switches::kSavePageAsMHTML)}, |
| - {"enable-quic", |
| - IDS_FLAGS_QUIC_NAME, |
| - IDS_FLAGS_QUIC_DESCRIPTION, |
| - kOsAll, |
| + {"enable-quic", IDS_FLAGS_QUIC_NAME, IDS_FLAGS_QUIC_DESCRIPTION, kOsAll, |
| ENABLE_DISABLE_VALUE_TYPE(switches::kEnableQuic, switches::kDisableQuic)}, |
| - {"enable-alternative-services", |
| - IDS_FLAGS_ALTSVC_NAME, |
| - IDS_FLAGS_ALTSVC_DESCRIPTION, |
| - kOsAll, |
| + {"enable-alternative-services", IDS_FLAGS_ALTSVC_NAME, |
| + IDS_FLAGS_ALTSVC_DESCRIPTION, kOsAll, |
| SINGLE_VALUE_TYPE(switches::kEnableAlternativeServices)}, |
| - {"disable-media-source", |
| - IDS_FLAGS_MEDIA_SOURCE_NAME, |
| - IDS_FLAGS_MEDIA_SOURCE_DESCRIPTION, |
| - kOsAll, |
| + {"disable-media-source", IDS_FLAGS_MEDIA_SOURCE_NAME, |
| + IDS_FLAGS_MEDIA_SOURCE_DESCRIPTION, kOsAll, |
| SINGLE_DISABLE_VALUE_TYPE(switches::kDisableMediaSource)}, |
| - {"disable-encrypted-media", |
| - IDS_FLAGS_ENCRYPTED_MEDIA_NAME, |
| - IDS_FLAGS_ENCRYPTED_MEDIA_DESCRIPTION, |
| - kOsAll, |
| + {"disable-encrypted-media", IDS_FLAGS_ENCRYPTED_MEDIA_NAME, |
| + IDS_FLAGS_ENCRYPTED_MEDIA_DESCRIPTION, kOsAll, |
| SINGLE_DISABLE_VALUE_TYPE(switches::kDisableEncryptedMedia)}, |
| - {"enable-prefixed-encrypted-media", |
| - IDS_FLAGS_PREFIXED_ENCRYPTED_MEDIA_NAME, |
| - IDS_FLAGS_PREFIXED_ENCRYPTED_MEDIA_DESCRIPTION, |
| - kOsAll, |
| + {"enable-prefixed-encrypted-media", IDS_FLAGS_PREFIXED_ENCRYPTED_MEDIA_NAME, |
| + IDS_FLAGS_PREFIXED_ENCRYPTED_MEDIA_DESCRIPTION, kOsAll, |
| SINGLE_VALUE_TYPE(switches::kEnablePrefixedEncryptedMedia)}, |
| {"disable-javascript-harmony-shipping", |
| IDS_FLAGS_JAVASCRIPT_HARMONY_SHIPPING_NAME, |
| - IDS_FLAGS_JAVASCRIPT_HARMONY_SHIPPING_DESCRIPTION, |
| - kOsAll, |
| + IDS_FLAGS_JAVASCRIPT_HARMONY_SHIPPING_DESCRIPTION, kOsAll, |
| SINGLE_DISABLE_VALUE_TYPE(switches::kDisableJavaScriptHarmonyShipping)}, |
| - {"enable-javascript-harmony", |
| - IDS_FLAGS_JAVASCRIPT_HARMONY_NAME, |
| - IDS_FLAGS_JAVASCRIPT_HARMONY_DESCRIPTION, |
| - kOsAll, |
| + {"enable-javascript-harmony", IDS_FLAGS_JAVASCRIPT_HARMONY_NAME, |
| + IDS_FLAGS_JAVASCRIPT_HARMONY_DESCRIPTION, kOsAll, |
| SINGLE_VALUE_TYPE(switches::kJavaScriptHarmony)}, |
| - {"disable-software-rasterizer", |
| - IDS_FLAGS_SOFTWARE_RASTERIZER_NAME, |
| + {"disable-software-rasterizer", IDS_FLAGS_SOFTWARE_RASTERIZER_NAME, |
| IDS_FLAGS_SOFTWARE_RASTERIZER_DESCRIPTION, |
| #if defined(ENABLE_SWIFTSHADER) |
| kOsAll, |
| @@ -716,48 +658,36 @@ const FeatureEntry kFeatureEntries[] = { |
| 0, |
| #endif |
| SINGLE_DISABLE_VALUE_TYPE(switches::kDisableSoftwareRasterizer)}, |
| - {"enable-gpu-rasterization", |
| - IDS_FLAGS_GPU_RASTERIZATION_NAME, |
| - IDS_FLAGS_GPU_RASTERIZATION_DESCRIPTION, |
| - kOsAll, |
| + {"enable-gpu-rasterization", IDS_FLAGS_GPU_RASTERIZATION_NAME, |
| + IDS_FLAGS_GPU_RASTERIZATION_DESCRIPTION, kOsAll, |
| MULTI_VALUE_TYPE(kEnableGpuRasterizationChoices)}, |
| {"gpu-rasterization-msaa-sample-count", |
| IDS_FLAGS_GPU_RASTERIZATION_MSAA_SAMPLE_COUNT_NAME, |
| - IDS_FLAGS_GPU_RASTERIZATION_MSAA_SAMPLE_COUNT_DESCRIPTION, |
| - kOsAll, |
| + IDS_FLAGS_GPU_RASTERIZATION_MSAA_SAMPLE_COUNT_DESCRIPTION, kOsAll, |
| MULTI_VALUE_TYPE(kGpuRasterizationMSAASampleCountChoices)}, |
| {"enable-experimental-web-platform-features", |
| IDS_FLAGS_EXPERIMENTAL_WEB_PLATFORM_FEATURES_NAME, |
| - IDS_FLAGS_EXPERIMENTAL_WEB_PLATFORM_FEATURES_DESCRIPTION, |
| - kOsAll, |
| + IDS_FLAGS_EXPERIMENTAL_WEB_PLATFORM_FEATURES_DESCRIPTION, kOsAll, |
| SINGLE_VALUE_TYPE(switches::kEnableExperimentalWebPlatformFeatures)}, |
| - {"enable-web-bluetooth", |
| - IDS_FLAGS_WEB_BLUETOOTH_NAME, |
| - IDS_FLAGS_WEB_BLUETOOTH_DESCRIPTION, |
| - kOsCrOS | kOsMac | kOsAndroid, |
| + {"enable-web-bluetooth", IDS_FLAGS_WEB_BLUETOOTH_NAME, |
| + IDS_FLAGS_WEB_BLUETOOTH_DESCRIPTION, kOsCrOS | kOsMac | kOsAndroid, |
| SINGLE_VALUE_TYPE(switches::kEnableWebBluetooth)}, |
| #if defined(ENABLE_EXTENSIONS) |
| {"enable-ble-advertising-in-apps", |
| IDS_FLAGS_BLE_ADVERTISING_IN_EXTENSIONS_NAME, |
| - IDS_FLAGS_BLE_ADVERTISING_IN_EXTENSIONS_DESCRIPTION, |
| - kOsCrOS, |
| + IDS_FLAGS_BLE_ADVERTISING_IN_EXTENSIONS_DESCRIPTION, kOsCrOS, |
| SINGLE_VALUE_TYPE(extensions::switches::kEnableBLEAdvertising)}, |
| #endif |
| - {"enable-devtools-experiments", |
| - IDS_FLAGS_DEVTOOLS_EXPERIMENTS_NAME, |
| - IDS_FLAGS_DEVTOOLS_EXPERIMENTS_DESCRIPTION, |
| - kOsDesktop, |
| + {"enable-devtools-experiments", IDS_FLAGS_DEVTOOLS_EXPERIMENTS_NAME, |
| + IDS_FLAGS_DEVTOOLS_EXPERIMENTS_DESCRIPTION, kOsDesktop, |
| SINGLE_VALUE_TYPE(switches::kEnableDevToolsExperiments)}, |
| {"silent-debugger-extension-api", |
| IDS_FLAGS_SILENT_DEBUGGER_EXTENSION_API_NAME, |
| - IDS_FLAGS_SILENT_DEBUGGER_EXTENSION_API_DESCRIPTION, |
| - kOsDesktop, |
| + IDS_FLAGS_SILENT_DEBUGGER_EXTENSION_API_DESCRIPTION, kOsDesktop, |
| SINGLE_VALUE_TYPE(switches::kSilentDebuggerExtensionAPI)}, |
| #if defined(ENABLE_SPELLCHECK) && defined(OS_ANDROID) |
| - {"enable-android-spellchecker", |
| - IDS_OPTIONS_ENABLE_SPELLCHECK, |
| - IDS_OPTIONS_ENABLE_ANDROID_SPELLCHECKER_DESCRIPTION, |
| - kOsAndroid, |
| + {"enable-android-spellchecker", IDS_OPTIONS_ENABLE_SPELLCHECK, |
| + IDS_OPTIONS_ENABLE_ANDROID_SPELLCHECKER_DESCRIPTION, kOsAndroid, |
| SINGLE_VALUE_TYPE(switches::kEnableAndroidSpellChecker)}, |
| #endif |
| #if defined(ENABLE_SPELLCHECK) && \ |
| @@ -769,239 +699,188 @@ const FeatureEntry kFeatureEntries[] = { |
| ENABLE_DISABLE_VALUE_TYPE(switches::kEnableMultilingualSpellChecker, |
| switches::kDisableMultilingualSpellChecker)}, |
| #endif |
| - {"enable-scroll-prediction", |
| - IDS_FLAGS_SCROLL_PREDICTION_NAME, |
| - IDS_FLAGS_SCROLL_PREDICTION_DESCRIPTION, |
| - kOsDesktop, |
| + {"enable-scroll-prediction", IDS_FLAGS_SCROLL_PREDICTION_NAME, |
| + IDS_FLAGS_SCROLL_PREDICTION_DESCRIPTION, kOsDesktop, |
| SINGLE_VALUE_TYPE(switches::kEnableScrollPrediction)}, |
| #if defined(ENABLE_TOPCHROME_MD) |
| - {"top-chrome-md", |
| - IDS_FLAGS_TOP_CHROME_MD, |
| - IDS_FLAGS_TOP_CHROME_MD_DESCRIPTION, |
| - kOsWin | kOsLinux | kOsCrOS, |
| + {"top-chrome-md", IDS_FLAGS_TOP_CHROME_MD, |
| + IDS_FLAGS_TOP_CHROME_MD_DESCRIPTION, kOsWin | kOsLinux | kOsCrOS, |
| MULTI_VALUE_TYPE(kTopChromeMaterialDesignChoices)}, |
| #endif |
| - {"touch-events", |
| - IDS_FLAGS_TOUCH_EVENTS_NAME, |
| - IDS_FLAGS_TOUCH_EVENTS_DESCRIPTION, |
| - kOsDesktop, |
| + {"touch-events", IDS_FLAGS_TOUCH_EVENTS_NAME, |
| + IDS_FLAGS_TOUCH_EVENTS_DESCRIPTION, kOsDesktop, |
| MULTI_VALUE_TYPE(kTouchEventsChoices)}, |
| - {"disable-touch-adjustment", |
| - IDS_FLAGS_TOUCH_ADJUSTMENT_NAME, |
| + {"disable-touch-adjustment", IDS_FLAGS_TOUCH_ADJUSTMENT_NAME, |
| IDS_FLAGS_TOUCH_ADJUSTMENT_DESCRIPTION, |
| kOsWin | kOsLinux | kOsCrOS | kOsAndroid, |
| SINGLE_DISABLE_VALUE_TYPE(switches::kDisableTouchAdjustment)}, |
| #if defined(OS_CHROMEOS) |
| - {"network-portal-notification", |
| - IDS_FLAGS_NETWORK_PORTAL_NOTIFICATION_NAME, |
| - IDS_FLAGS_NETWORK_PORTAL_NOTIFICATION_DESCRIPTION, |
| - kOsCrOS, |
| + {"network-portal-notification", IDS_FLAGS_NETWORK_PORTAL_NOTIFICATION_NAME, |
| + IDS_FLAGS_NETWORK_PORTAL_NOTIFICATION_DESCRIPTION, kOsCrOS, |
| ENABLE_DISABLE_VALUE_TYPE( |
| chromeos::switches::kEnableNetworkPortalNotification, |
| chromeos::switches::kDisableNetworkPortalNotification)}, |
| #endif |
| - {"enable-download-resumption", |
| - IDS_FLAGS_DOWNLOAD_RESUMPTION_NAME, |
| - IDS_FLAGS_DOWNLOAD_RESUMPTION_DESCRIPTION, |
| - kOsDesktop, |
| + {"enable-download-resumption", IDS_FLAGS_DOWNLOAD_RESUMPTION_NAME, |
| + IDS_FLAGS_DOWNLOAD_RESUMPTION_DESCRIPTION, kOsDesktop, |
| FEATURE_VALUE_TYPE(features::kDownloadResumption)}, |
| #if defined(OS_CHROMEOS) |
| - {"download-notification", |
| - IDS_FLAGS_DOWNLOAD_NOTIFICATION_NAME, |
| - IDS_FLAGS_DOWNLOAD_NOTIFICATION_DESCRIPTION, |
| - kOsCrOS, |
| + {"download-notification", IDS_FLAGS_DOWNLOAD_NOTIFICATION_NAME, |
| + IDS_FLAGS_DOWNLOAD_NOTIFICATION_DESCRIPTION, kOsCrOS, |
| SINGLE_DISABLE_VALUE_TYPE(switches::kDisableDownloadNotification)}, |
| #endif |
| #if defined(ENABLE_PLUGINS) |
| - {"allow-nacl-socket-api", |
| - IDS_FLAGS_ALLOW_NACL_SOCKET_API_NAME, |
| - IDS_FLAGS_ALLOW_NACL_SOCKET_API_DESCRIPTION, |
| - kOsDesktop, |
| + {"allow-nacl-socket-api", IDS_FLAGS_ALLOW_NACL_SOCKET_API_NAME, |
| + IDS_FLAGS_ALLOW_NACL_SOCKET_API_DESCRIPTION, kOsDesktop, |
| SINGLE_VALUE_TYPE_AND_VALUE(switches::kAllowNaClSocketAPI, "*")}, |
| #endif |
| #if defined(OS_CHROMEOS) |
| {"allow-touchpad-three-finger-click", |
| IDS_FLAGS_ALLOW_TOUCHPAD_THREE_FINGER_CLICK_NAME, |
| - IDS_FLAGS_ALLOW_TOUCHPAD_THREE_FINGER_CLICK_DESCRIPTION, |
| - kOsCrOS, |
| + IDS_FLAGS_ALLOW_TOUCHPAD_THREE_FINGER_CLICK_DESCRIPTION, kOsCrOS, |
| SINGLE_VALUE_TYPE(chromeos::switches::kEnableTouchpadThreeFingerClick)}, |
| - {"ash-enable-unified-desktop", |
| - IDS_FLAGS_ASH_ENABLE_UNIFIED_DESKTOP_NAME, |
| - IDS_FLAGS_ASH_ENABLE_UNIFIED_DESKTOP_DESCRIPTION, |
| - kOsCrOS, |
| + {"ash-enable-unified-desktop", IDS_FLAGS_ASH_ENABLE_UNIFIED_DESKTOP_NAME, |
| + IDS_FLAGS_ASH_ENABLE_UNIFIED_DESKTOP_DESCRIPTION, kOsCrOS, |
| SINGLE_VALUE_TYPE(ash::switches::kAshEnableUnifiedDesktop)}, |
| {"enable-easy-unlock-proximity-detection", |
| IDS_FLAGS_EASY_UNLOCK_PROXIMITY_DETECTION_NAME, |
| - IDS_FLAGS_EASY_UNLOCK_PROXIMITY_DETECTION_DESCRIPTION, |
| - kOsCrOS, |
| + IDS_FLAGS_EASY_UNLOCK_PROXIMITY_DETECTION_DESCRIPTION, kOsCrOS, |
| SINGLE_VALUE_TYPE(proximity_auth::switches::kEnableProximityDetection)}, |
| {"enable-easy-unlock-bluetooth-low-energy-detection", |
| IDS_FLAGS_EASY_UNLOCK_BLUETOOTH_LOW_ENERGY_DISCOVERY_NAME, |
| - IDS_FLAGS_EASY_UNLOCK_BLUETOOTH_LOW_ENERGY_DISCOVERY_DESCRIPTION, |
| - kOsCrOS, |
| + IDS_FLAGS_EASY_UNLOCK_BLUETOOTH_LOW_ENERGY_DISCOVERY_DESCRIPTION, kOsCrOS, |
| SINGLE_VALUE_TYPE( |
| proximity_auth::switches::kEnableBluetoothLowEnergyDiscovery)}, |
| #endif |
| #if defined(USE_ASH) |
| {"disable-minimize-on-second-launcher-item-click", |
| IDS_FLAGS_MINIMIZE_ON_SECOND_LAUNCHER_ITEM_CLICK_NAME, |
| - IDS_FLAGS_MINIMIZE_ON_SECOND_LAUNCHER_ITEM_CLICK_DESCRIPTION, |
| - kOsAll, |
| + IDS_FLAGS_MINIMIZE_ON_SECOND_LAUNCHER_ITEM_CLICK_DESCRIPTION, kOsAll, |
| SINGLE_DISABLE_VALUE_TYPE( |
| switches::kDisableMinimizeOnSecondLauncherItemClick)}, |
| - {"show-touch-hud", |
| - IDS_FLAGS_SHOW_TOUCH_HUD_NAME, |
| - IDS_FLAGS_SHOW_TOUCH_HUD_DESCRIPTION, |
| - kOsAll, |
| + {"show-touch-hud", IDS_FLAGS_SHOW_TOUCH_HUD_NAME, |
| + IDS_FLAGS_SHOW_TOUCH_HUD_DESCRIPTION, kOsAll, |
| SINGLE_VALUE_TYPE(ash::switches::kAshTouchHud)}, |
| { |
| - "enable-pinch", |
| - IDS_FLAGS_PINCH_SCALE_NAME, |
| - IDS_FLAGS_PINCH_SCALE_DESCRIPTION, |
| - kOsLinux | kOsWin | kOsCrOS, |
| - ENABLE_DISABLE_VALUE_TYPE(switches::kEnablePinch, switches::kDisablePinch), |
| + "enable-pinch", IDS_FLAGS_PINCH_SCALE_NAME, |
| + IDS_FLAGS_PINCH_SCALE_DESCRIPTION, kOsLinux | kOsWin | kOsCrOS, |
| + ENABLE_DISABLE_VALUE_TYPE(switches::kEnablePinch, |
| + switches::kDisablePinch), |
| }, |
| #endif // defined(USE_ASH) |
| #if defined(OS_CHROMEOS) |
| { |
| - "disable-boot-animation", |
| - IDS_FLAGS_BOOT_ANIMATION, |
| - IDS_FLAGS_BOOT_ANIMATION_DESCRIPTION, |
| - kOsCrOSOwnerOnly, |
| - SINGLE_DISABLE_VALUE_TYPE(chromeos::switches::kDisableBootAnimation), |
| + "disable-boot-animation", IDS_FLAGS_BOOT_ANIMATION, |
| + IDS_FLAGS_BOOT_ANIMATION_DESCRIPTION, kOsCrOSOwnerOnly, |
| + SINGLE_DISABLE_VALUE_TYPE(chromeos::switches::kDisableBootAnimation), |
| }, |
| {"enable-video-player-chromecast-support", |
| IDS_FLAGS_VIDEO_PLAYER_CHROMECAST_SUPPORT_NAME, |
| - IDS_FLAGS_VIDEO_PLAYER_CHROMECAST_SUPPORT_DESCRIPTION, |
| - kOsCrOS, |
| + IDS_FLAGS_VIDEO_PLAYER_CHROMECAST_SUPPORT_DESCRIPTION, kOsCrOS, |
| SINGLE_VALUE_TYPE( |
| chromeos::switches::kEnableVideoPlayerChromecastSupport)}, |
| { |
| - "disable-office-editing-component-app", |
| - IDS_FLAGS_OFFICE_EDITING_COMPONENT_APP_NAME, |
| - IDS_FLAGS_OFFICE_EDITING_COMPONENT_APP_DESCRIPTION, |
| - kOsCrOS, |
| - SINGLE_DISABLE_VALUE_TYPE( |
| - chromeos::switches::kDisableOfficeEditingComponentApp), |
| + "disable-office-editing-component-app", |
| + IDS_FLAGS_OFFICE_EDITING_COMPONENT_APP_NAME, |
| + IDS_FLAGS_OFFICE_EDITING_COMPONENT_APP_DESCRIPTION, kOsCrOS, |
| + SINGLE_DISABLE_VALUE_TYPE( |
| + chromeos::switches::kDisableOfficeEditingComponentApp), |
| }, |
| { |
| - "disable-display-color-calibration", |
| - IDS_FLAGS_DISPLAY_COLOR_CALIBRATION_NAME, |
| - IDS_FLAGS_DISPLAY_COLOR_CALIBRATION_DESCRIPTION, |
| - kOsCrOS, |
| - SINGLE_DISABLE_VALUE_TYPE(ui::switches::kDisableDisplayColorCalibration), |
| + "disable-display-color-calibration", |
| + IDS_FLAGS_DISPLAY_COLOR_CALIBRATION_NAME, |
| + IDS_FLAGS_DISPLAY_COLOR_CALIBRATION_DESCRIPTION, kOsCrOS, |
| + SINGLE_DISABLE_VALUE_TYPE( |
| + ui::switches::kDisableDisplayColorCalibration), |
| }, |
| { |
| - "ash-disable-screen-orientation-lock", |
| - IDS_FLAGS_ASH_SCREEN_ORIENTATION_LOCK_NAME, |
| - IDS_FLAGS_ASH_SCREEN_ORIENTATION_LOCK_DESCRIPTION, |
| - kOsCrOS, |
| - SINGLE_DISABLE_VALUE_TYPE(ash::switches::kAshDisableScreenOrientationLock), |
| + "ash-disable-screen-orientation-lock", |
| + IDS_FLAGS_ASH_SCREEN_ORIENTATION_LOCK_NAME, |
| + IDS_FLAGS_ASH_SCREEN_ORIENTATION_LOCK_DESCRIPTION, kOsCrOS, |
| + SINGLE_DISABLE_VALUE_TYPE( |
| + ash::switches::kAshDisableScreenOrientationLock), |
| }, |
| #endif // defined(OS_CHROMEOS) |
| { |
| - "disable-accelerated-video-decode", |
| - IDS_FLAGS_ACCELERATED_VIDEO_DECODE_NAME, |
| - IDS_FLAGS_ACCELERATED_VIDEO_DECODE_DESCRIPTION, |
| - kOsMac | kOsWin | kOsCrOS, |
| - SINGLE_DISABLE_VALUE_TYPE(switches::kDisableAcceleratedVideoDecode), |
| + "disable-accelerated-video-decode", |
| + IDS_FLAGS_ACCELERATED_VIDEO_DECODE_NAME, |
| + IDS_FLAGS_ACCELERATED_VIDEO_DECODE_DESCRIPTION, |
| + kOsMac | kOsWin | kOsCrOS, |
| + SINGLE_DISABLE_VALUE_TYPE(switches::kDisableAcceleratedVideoDecode), |
| }, |
| #if defined(USE_ASH) |
| { |
| - "ash-debug-shortcuts", |
| - IDS_FLAGS_DEBUG_SHORTCUTS_NAME, |
| - IDS_FLAGS_DEBUG_SHORTCUTS_DESCRIPTION, |
| - kOsAll, |
| - SINGLE_VALUE_TYPE(ash::switches::kAshDebugShortcuts), |
| + "ash-debug-shortcuts", IDS_FLAGS_DEBUG_SHORTCUTS_NAME, |
| + IDS_FLAGS_DEBUG_SHORTCUTS_DESCRIPTION, kOsAll, |
| + SINGLE_VALUE_TYPE(ash::switches::kAshDebugShortcuts), |
| }, |
| { |
| - "ash-disable-maximize-mode-window-backdrop", |
| - IDS_FLAGS_ASH_MAXIMIZE_MODE_WINDOW_BACKDROP_NAME, |
| - IDS_FLAGS_ASH_MAXIMIZE_MODE_WINDOW_BACKDROP_DESCRIPTION, |
| - kOsCrOS, |
| - SINGLE_DISABLE_VALUE_TYPE( |
| - ash::switches::kAshDisableMaximizeModeWindowBackdrop), |
| + "ash-disable-maximize-mode-window-backdrop", |
| + IDS_FLAGS_ASH_MAXIMIZE_MODE_WINDOW_BACKDROP_NAME, |
| + IDS_FLAGS_ASH_MAXIMIZE_MODE_WINDOW_BACKDROP_DESCRIPTION, kOsCrOS, |
| + SINGLE_DISABLE_VALUE_TYPE( |
| + ash::switches::kAshDisableMaximizeModeWindowBackdrop), |
| }, |
| { |
| - "ash-enable-touch-view-testing", |
| - IDS_FLAGS_ASH_ENABLE_TOUCH_VIEW_TESTING_NAME, |
| - IDS_FLAGS_ASH_ENABLE_TOUCH_VIEW_TESTING_DESCRIPTION, |
| - kOsCrOS, |
| - SINGLE_VALUE_TYPE(ash::switches::kAshEnableTouchViewTesting), |
| + "ash-enable-touch-view-testing", |
| + IDS_FLAGS_ASH_ENABLE_TOUCH_VIEW_TESTING_NAME, |
| + IDS_FLAGS_ASH_ENABLE_TOUCH_VIEW_TESTING_DESCRIPTION, kOsCrOS, |
| + SINGLE_VALUE_TYPE(ash::switches::kAshEnableTouchViewTesting), |
| }, |
| { |
| - "disable-touch-feedback", |
| - IDS_FLAGS_TOUCH_FEEDBACK_NAME, |
| - IDS_FLAGS_TOUCH_FEEDBACK_DESCRIPTION, |
| - kOsCrOS, |
| - SINGLE_DISABLE_VALUE_TYPE(switches::kDisableTouchFeedback), |
| + "disable-touch-feedback", IDS_FLAGS_TOUCH_FEEDBACK_NAME, |
| + IDS_FLAGS_TOUCH_FEEDBACK_DESCRIPTION, kOsCrOS, |
| + SINGLE_DISABLE_VALUE_TYPE(switches::kDisableTouchFeedback), |
| }, |
| { |
| - "ash-enable-mirrored-screen", |
| - IDS_FLAGS_ASH_ENABLE_MIRRORED_SCREEN_NAME, |
| - IDS_FLAGS_ASH_ENABLE_MIRRORED_SCREEN_DESCRIPTION, |
| - kOsCrOS, |
| - SINGLE_VALUE_TYPE(ash::switches::kAshEnableMirroredScreen), |
| + "ash-enable-mirrored-screen", IDS_FLAGS_ASH_ENABLE_MIRRORED_SCREEN_NAME, |
| + IDS_FLAGS_ASH_ENABLE_MIRRORED_SCREEN_DESCRIPTION, kOsCrOS, |
| + SINGLE_VALUE_TYPE(ash::switches::kAshEnableMirroredScreen), |
| }, |
| { |
| - "ash-stable-overview-order", |
| - IDS_FLAGS_ASH_STABLE_OVERVIEW_ORDER_NAME, |
| - IDS_FLAGS_ASH_STABLE_OVERVIEW_ORDER_DESCRIPTION, |
| - kOsCrOS, |
| - ENABLE_DISABLE_VALUE_TYPE(ash::switches::kAshEnableStableOverviewOrder, |
| - ash::switches::kAshDisableStableOverviewOrder), |
| + "ash-stable-overview-order", IDS_FLAGS_ASH_STABLE_OVERVIEW_ORDER_NAME, |
| + IDS_FLAGS_ASH_STABLE_OVERVIEW_ORDER_DESCRIPTION, kOsCrOS, |
| + ENABLE_DISABLE_VALUE_TYPE( |
| + ash::switches::kAshEnableStableOverviewOrder, |
| + ash::switches::kAshDisableStableOverviewOrder), |
| }, |
| #endif // defined(USE_ASH) |
| #if defined(OS_CHROMEOS) |
| {"material-design-ink-drop-animation-speed", |
| IDS_FLAGS_MATERIAL_DESIGN_INK_DROP_ANIMATION_SPEED_NAME, |
| - IDS_FLAGS_MATERIAL_DESIGN_INK_DROP_ANIMATION_SPEED_DESCRIPTION, |
| - kOsCrOS, |
| + IDS_FLAGS_MATERIAL_DESIGN_INK_DROP_ANIMATION_SPEED_DESCRIPTION, kOsCrOS, |
| MULTI_VALUE_TYPE(kAshMaterialDesignInkDropAnimationSpeed)}, |
| - {"disable-cloud-import", |
| - IDS_FLAGS_CLOUD_IMPORT, |
| - IDS_FLAGS_CLOUD_IMPORT_DESCRIPTION, |
| - kOsCrOS, |
| + {"disable-cloud-import", IDS_FLAGS_CLOUD_IMPORT, |
| + IDS_FLAGS_CLOUD_IMPORT_DESCRIPTION, kOsCrOS, |
| SINGLE_DISABLE_VALUE_TYPE(chromeos::switches::kDisableCloudImport)}, |
| - {"enable-request-tablet-site", |
| - IDS_FLAGS_REQUEST_TABLET_SITE_NAME, |
| - IDS_FLAGS_REQUEST_TABLET_SITE_DESCRIPTION, |
| - kOsCrOS, |
| + {"enable-request-tablet-site", IDS_FLAGS_REQUEST_TABLET_SITE_NAME, |
| + IDS_FLAGS_REQUEST_TABLET_SITE_DESCRIPTION, kOsCrOS, |
| SINGLE_VALUE_TYPE(chromeos::switches::kEnableRequestTabletSite)}, |
| #endif |
| - {"debug-packed-apps", |
| - IDS_FLAGS_DEBUG_PACKED_APP_NAME, |
| - IDS_FLAGS_DEBUG_PACKED_APP_DESCRIPTION, |
| - kOsDesktop, |
| + {"debug-packed-apps", IDS_FLAGS_DEBUG_PACKED_APP_NAME, |
| + IDS_FLAGS_DEBUG_PACKED_APP_DESCRIPTION, kOsDesktop, |
| SINGLE_VALUE_TYPE(switches::kDebugPackedApps)}, |
| - {"enable-password-generation", |
| - IDS_FLAGS_PASSWORD_GENERATION_NAME, |
| + {"enable-password-generation", IDS_FLAGS_PASSWORD_GENERATION_NAME, |
| IDS_FLAGS_PASSWORD_GENERATION_DESCRIPTION, |
| kOsWin | kOsLinux | kOsCrOS | kOsMac | kOsAndroid, |
| ENABLE_DISABLE_VALUE_TYPE(autofill::switches::kEnablePasswordGeneration, |
| autofill::switches::kDisablePasswordGeneration)}, |
| {"enable-automatic-password-saving", |
| IDS_FLAGS_AUTOMATIC_PASSWORD_SAVING_NAME, |
| - IDS_FLAGS_AUTOMATIC_PASSWORD_SAVING_DESCRIPTION, |
| - kOsDesktop, |
| + IDS_FLAGS_AUTOMATIC_PASSWORD_SAVING_DESCRIPTION, kOsDesktop, |
| FEATURE_VALUE_TYPE( |
| password_manager::features::kEnableAutomaticPasswordSaving)}, |
| {"password-manager-reauthentication", |
| IDS_FLAGS_PASSWORD_MANAGER_REAUTHENTICATION_NAME, |
| - IDS_FLAGS_PASSWORD_MANAGER_REAUTHENTICATION_DESCRIPTION, |
| - kOsMac | kOsWin, |
| + IDS_FLAGS_PASSWORD_MANAGER_REAUTHENTICATION_DESCRIPTION, kOsMac | kOsWin, |
| SINGLE_DISABLE_VALUE_TYPE( |
| switches::kDisablePasswordManagerReauthentication)}, |
| - {"enable-password-change-support", |
| - IDS_FLAGS_PASSWORD_CHANGE_SUPPORT_NAME, |
| - IDS_FLAGS_PASSWORD_CHANGE_SUPPORT_DESCRIPTION, |
| - kOsMac, |
| + {"enable-password-change-support", IDS_FLAGS_PASSWORD_CHANGE_SUPPORT_NAME, |
| + IDS_FLAGS_PASSWORD_CHANGE_SUPPORT_DESCRIPTION, kOsMac, |
| FEATURE_VALUE_TYPE( |
| password_manager::features::kEnablePasswordChangeSupport)}, |
| - {"enable-password-force-saving", |
| - IDS_FLAGS_PASSWORD_FORCE_SAVING_NAME, |
| - IDS_FLAGS_PASSWORD_FORCE_SAVING_DESCRIPTION, |
| - kOsAll, |
| + {"enable-password-force-saving", IDS_FLAGS_PASSWORD_FORCE_SAVING_NAME, |
| + IDS_FLAGS_PASSWORD_FORCE_SAVING_DESCRIPTION, kOsAll, |
| FEATURE_VALUE_TYPE( |
| password_manager::features::kEnablePasswordForceSaving)}, |
| {"enable-affiliation-based-matching", |
| @@ -1011,10 +890,8 @@ const FeatureEntry kFeatureEntries[] = { |
| ENABLE_DISABLE_VALUE_TYPE( |
| password_manager::switches::kEnableAffiliationBasedMatching, |
| password_manager::switches::kDisableAffiliationBasedMatching)}, |
| - {"wallet-service-use-sandbox", |
| - IDS_FLAGS_WALLET_SERVICE_USE_SANDBOX_NAME, |
| - IDS_FLAGS_WALLET_SERVICE_USE_SANDBOX_DESCRIPTION, |
| - kOsAndroid | kOsDesktop, |
| + {"wallet-service-use-sandbox", IDS_FLAGS_WALLET_SERVICE_USE_SANDBOX_NAME, |
| + IDS_FLAGS_WALLET_SERVICE_USE_SANDBOX_DESCRIPTION, kOsAndroid | kOsDesktop, |
| ENABLE_DISABLE_VALUE_TYPE_AND_VALUE( |
| autofill::switches::kWalletServiceUseSandbox, |
| "1", |
| @@ -1023,39 +900,29 @@ const FeatureEntry kFeatureEntries[] = { |
| #if defined(USE_AURA) |
| {"overscroll-history-navigation", |
| IDS_FLAGS_OVERSCROLL_HISTORY_NAVIGATION_NAME, |
| - IDS_FLAGS_OVERSCROLL_HISTORY_NAVIGATION_DESCRIPTION, |
| - kOsAll, |
| + IDS_FLAGS_OVERSCROLL_HISTORY_NAVIGATION_DESCRIPTION, kOsAll, |
| MULTI_VALUE_TYPE(kOverscrollHistoryNavigationChoices)}, |
| #endif |
| - {"scroll-end-effect", |
| - IDS_FLAGS_SCROLL_END_EFFECT_NAME, |
| - IDS_FLAGS_SCROLL_END_EFFECT_DESCRIPTION, |
| - kOsCrOS, |
| + {"scroll-end-effect", IDS_FLAGS_SCROLL_END_EFFECT_NAME, |
| + IDS_FLAGS_SCROLL_END_EFFECT_DESCRIPTION, kOsCrOS, |
| ENABLE_DISABLE_VALUE_TYPE_AND_VALUE(switches::kScrollEndEffect, |
| "1", |
| switches::kScrollEndEffect, |
| "0")}, |
| - {"enable-icon-ntp", |
| - IDS_FLAGS_ICON_NTP_NAME, |
| - IDS_FLAGS_ICON_NTP_DESCRIPTION, |
| + {"enable-icon-ntp", IDS_FLAGS_ICON_NTP_NAME, IDS_FLAGS_ICON_NTP_DESCRIPTION, |
| kOsAndroid | kOsMac | kOsWin | kOsLinux | kOsCrOS, |
| ENABLE_DISABLE_VALUE_TYPE(switches::kEnableIconNtp, |
| switches::kDisableIconNtp)}, |
| - {"enable-touch-drag-drop", |
| - IDS_FLAGS_TOUCH_DRAG_DROP_NAME, |
| - IDS_FLAGS_TOUCH_DRAG_DROP_DESCRIPTION, |
| - kOsWin | kOsCrOS, |
| + {"enable-touch-drag-drop", IDS_FLAGS_TOUCH_DRAG_DROP_NAME, |
| + IDS_FLAGS_TOUCH_DRAG_DROP_DESCRIPTION, kOsWin | kOsCrOS, |
| ENABLE_DISABLE_VALUE_TYPE(switches::kEnableTouchDragDrop, |
| switches::kDisableTouchDragDrop)}, |
| - {"touch-selection-strategy", |
| - IDS_FLAGS_TOUCH_SELECTION_STRATEGY_NAME, |
| + {"touch-selection-strategy", IDS_FLAGS_TOUCH_SELECTION_STRATEGY_NAME, |
| IDS_FLAGS_TOUCH_SELECTION_STRATEGY_DESCRIPTION, |
| kOsAndroid, // TODO(mfomitchev): Add CrOS/Win/Linux support soon. |
| MULTI_VALUE_TYPE(kTouchTextSelectionStrategyChoices)}, |
| - {"enable-navigation-tracing", |
| - IDS_FLAGS_ENABLE_NAVIGATION_TRACING, |
| - IDS_FLAGS_ENABLE_NAVIGATION_TRACING_DESCRIPTION, |
| - kOsAll, |
| + {"enable-navigation-tracing", IDS_FLAGS_ENABLE_NAVIGATION_TRACING, |
| + IDS_FLAGS_ENABLE_NAVIGATION_TRACING_DESCRIPTION, kOsAll, |
| SINGLE_VALUE_TYPE(switches::kEnableNavigationTracing)}, |
| #if defined(OS_ANDROID) |
| {"enable-non-validating-reload-on-refresh-content", |
| @@ -1064,22 +931,18 @@ const FeatureEntry kFeatureEntries[] = { |
| kOsAndroid, |
| SINGLE_VALUE_TYPE(switches::kEnableNonValidatingReloadOnRefreshContent)}, |
| #endif |
| - {"trace-upload-url", |
| - IDS_FLAGS_TRACE_UPLOAD_URL, |
| - IDS_FLAGS_TRACE_UPLOAD_URL_DESCRIPTION, |
| - kOsAll, |
| + {"trace-upload-url", IDS_FLAGS_TRACE_UPLOAD_URL, |
| + IDS_FLAGS_TRACE_UPLOAD_URL_DESCRIPTION, kOsAll, |
| MULTI_VALUE_TYPE(kTraceUploadURL)}, |
| #if !defined(OS_IOS) |
| {"enable-stale-while-revalidate", |
| IDS_FLAGS_ENABLE_STALE_WHILE_REVALIDATE_NAME, |
| - IDS_FLAGS_ENABLE_STALE_WHILE_REVALIDATE_DESCRIPTION, |
| - kOsAll, |
| + IDS_FLAGS_ENABLE_STALE_WHILE_REVALIDATE_DESCRIPTION, kOsAll, |
| SINGLE_VALUE_TYPE(switches::kEnableStaleWhileRevalidate)}, |
| #endif |
| {"enable-suggestions-with-substring-match", |
| IDS_FLAGS_SUGGESTIONS_WITH_SUB_STRING_MATCH_NAME, |
| - IDS_FLAGS_SUGGESTIONS_WITH_SUB_STRING_MATCH_DESCRIPTION, |
| - kOsAll, |
| + IDS_FLAGS_SUGGESTIONS_WITH_SUB_STRING_MATCH_DESCRIPTION, kOsAll, |
| SINGLE_VALUE_TYPE( |
| autofill::switches::kEnableSuggestionsWithSubstringMatch)}, |
| {"enable-supervised-user-managed-bookmarks-folder", |
| @@ -1088,181 +951,128 @@ const FeatureEntry kFeatureEntries[] = { |
| kOsAndroid | kOsMac | kOsWin | kOsLinux | kOsCrOS, |
| SINGLE_VALUE_TYPE(switches::kEnableSupervisedUserManagedBookmarksFolder)}, |
| #if defined(ENABLE_APP_LIST) |
| - {"enable-sync-app-list", |
| - IDS_FLAGS_SYNC_APP_LIST_NAME, |
| - IDS_FLAGS_SYNC_APP_LIST_DESCRIPTION, |
| - kOsDesktop, |
| + {"enable-sync-app-list", IDS_FLAGS_SYNC_APP_LIST_NAME, |
| + IDS_FLAGS_SYNC_APP_LIST_DESCRIPTION, kOsDesktop, |
| ENABLE_DISABLE_VALUE_TYPE(app_list::switches::kEnableSyncAppList, |
| app_list::switches::kDisableSyncAppList)}, |
| #endif |
| #if defined(OS_MACOSX) |
| - {"enable-avfoundation", |
| - IDS_FLAGS_AVFOUNDATION_NAME, |
| - IDS_FLAGS_AVFOUNDATION_DESCRIPTION, |
| - kOsMac, |
| + {"enable-avfoundation", IDS_FLAGS_AVFOUNDATION_NAME, |
| + IDS_FLAGS_AVFOUNDATION_DESCRIPTION, kOsMac, |
| ENABLE_DISABLE_VALUE_TYPE(switches::kEnableAVFoundation, |
| switches::kForceQTKit)}, |
| #endif |
| - {"lcd-text-aa", |
| - IDS_FLAGS_LCD_TEXT_NAME, |
| - IDS_FLAGS_LCD_TEXT_DESCRIPTION, |
| - kOsDesktop, |
| - ENABLE_DISABLE_VALUE_TYPE(switches::kEnableLCDText, |
| - switches::kDisableLCDText)}, |
| + {"lcd-text-aa", IDS_FLAGS_LCD_TEXT_NAME, IDS_FLAGS_LCD_TEXT_DESCRIPTION, |
| + kOsDesktop, ENABLE_DISABLE_VALUE_TYPE(switches::kEnableLCDText, |
| + switches::kDisableLCDText)}, |
| {"enable-offer-store-unmasked-wallet-cards", |
| IDS_FLAGS_OFFER_STORE_UNMASKED_WALLET_CARDS, |
| - IDS_FLAGS_OFFER_STORE_UNMASKED_WALLET_CARDS_DESCRIPTION, |
| - kOsAll, |
| + IDS_FLAGS_OFFER_STORE_UNMASKED_WALLET_CARDS_DESCRIPTION, kOsAll, |
| ENABLE_DISABLE_VALUE_TYPE( |
| autofill::switches::kEnableOfferStoreUnmaskedWalletCards, |
| autofill::switches::kDisableOfferStoreUnmaskedWalletCards)}, |
| - {"enable-offline-auto-reload", |
| - IDS_FLAGS_OFFLINE_AUTO_RELOAD_NAME, |
| - IDS_FLAGS_OFFLINE_AUTO_RELOAD_DESCRIPTION, |
| - kOsAll, |
| + {"enable-offline-auto-reload", IDS_FLAGS_OFFLINE_AUTO_RELOAD_NAME, |
| + IDS_FLAGS_OFFLINE_AUTO_RELOAD_DESCRIPTION, kOsAll, |
| ENABLE_DISABLE_VALUE_TYPE(switches::kEnableOfflineAutoReload, |
| switches::kDisableOfflineAutoReload)}, |
| {"enable-offline-auto-reload-visible-only", |
| IDS_FLAGS_OFFLINE_AUTO_RELOAD_VISIBLE_ONLY_NAME, |
| - IDS_FLAGS_OFFLINE_AUTO_RELOAD_VISIBLE_ONLY_DESCRIPTION, |
| - kOsAll, |
| + IDS_FLAGS_OFFLINE_AUTO_RELOAD_VISIBLE_ONLY_DESCRIPTION, kOsAll, |
| ENABLE_DISABLE_VALUE_TYPE(switches::kEnableOfflineAutoReloadVisibleOnly, |
| switches::kDisableOfflineAutoReloadVisibleOnly)}, |
| - {"show-saved-copy", |
| - IDS_FLAGS_SHOW_SAVED_COPY_NAME, |
| - IDS_FLAGS_SHOW_SAVED_COPY_DESCRIPTION, |
| - kOsAll, |
| + {"show-saved-copy", IDS_FLAGS_SHOW_SAVED_COPY_NAME, |
| + IDS_FLAGS_SHOW_SAVED_COPY_DESCRIPTION, kOsAll, |
| MULTI_VALUE_TYPE(kShowSavedCopyChoices)}, |
| - {"default-tile-width", |
| - IDS_FLAGS_DEFAULT_TILE_WIDTH_NAME, |
| - IDS_FLAGS_DEFAULT_TILE_WIDTH_DESCRIPTION, |
| - kOsAll, |
| + {"default-tile-width", IDS_FLAGS_DEFAULT_TILE_WIDTH_NAME, |
| + IDS_FLAGS_DEFAULT_TILE_WIDTH_DESCRIPTION, kOsAll, |
| MULTI_VALUE_TYPE(kDefaultTileWidthChoices)}, |
| - {"default-tile-height", |
| - IDS_FLAGS_DEFAULT_TILE_HEIGHT_NAME, |
| - IDS_FLAGS_DEFAULT_TILE_HEIGHT_DESCRIPTION, |
| - kOsAll, |
| + {"default-tile-height", IDS_FLAGS_DEFAULT_TILE_HEIGHT_NAME, |
| + IDS_FLAGS_DEFAULT_TILE_HEIGHT_DESCRIPTION, kOsAll, |
| MULTI_VALUE_TYPE(kDefaultTileHeightChoices)}, |
| {"disable-gesture-requirement-for-media-playback", |
| IDS_FLAGS_GESTURE_REQUIREMENT_FOR_MEDIA_PLAYBACK_NAME, |
| - IDS_FLAGS_GESTURE_REQUIREMENT_FOR_MEDIA_PLAYBACK_DESCRIPTION, |
| - kOsAll, |
| + IDS_FLAGS_GESTURE_REQUIREMENT_FOR_MEDIA_PLAYBACK_DESCRIPTION, kOsAll, |
| SINGLE_DISABLE_VALUE_TYPE( |
| switches::kDisableGestureRequirementForMediaPlayback)}, |
| #if defined(OS_CHROMEOS) |
| - {"enable-virtual-keyboard", |
| - IDS_FLAGS_VIRTUAL_KEYBOARD_NAME, |
| - IDS_FLAGS_VIRTUAL_KEYBOARD_DESCRIPTION, |
| - kOsCrOS, |
| + {"enable-virtual-keyboard", IDS_FLAGS_VIRTUAL_KEYBOARD_NAME, |
| + IDS_FLAGS_VIRTUAL_KEYBOARD_DESCRIPTION, kOsCrOS, |
| SINGLE_VALUE_TYPE(keyboard::switches::kEnableVirtualKeyboard)}, |
| - {"virtual-keyboard-overscroll", |
| - IDS_FLAGS_VIRTUAL_KEYBOARD_OVERSCROLL_NAME, |
| - IDS_FLAGS_VIRTUAL_KEYBOARD_OVERSCROLL_DESCRIPTION, |
| - kOsCrOS, |
| + {"virtual-keyboard-overscroll", IDS_FLAGS_VIRTUAL_KEYBOARD_OVERSCROLL_NAME, |
| + IDS_FLAGS_VIRTUAL_KEYBOARD_OVERSCROLL_DESCRIPTION, kOsCrOS, |
| SINGLE_DISABLE_VALUE_TYPE( |
| keyboard::switches::kDisableVirtualKeyboardOverscroll)}, |
| - {"input-view", |
| - IDS_FLAGS_INPUT_VIEW_NAME, |
| - IDS_FLAGS_INPUT_VIEW_DESCRIPTION, |
| - kOsCrOS, |
| - SINGLE_DISABLE_VALUE_TYPE(keyboard::switches::kDisableInputView)}, |
| - {"disable-new-korean-ime", |
| - IDS_FLAGS_NEW_KOREAN_IME_NAME, |
| - IDS_FLAGS_NEW_KOREAN_IME_DESCRIPTION, |
| - kOsCrOS, |
| + {"input-view", IDS_FLAGS_INPUT_VIEW_NAME, IDS_FLAGS_INPUT_VIEW_DESCRIPTION, |
| + kOsCrOS, SINGLE_DISABLE_VALUE_TYPE(keyboard::switches::kDisableInputView)}, |
| + {"disable-new-korean-ime", IDS_FLAGS_NEW_KOREAN_IME_NAME, |
| + IDS_FLAGS_NEW_KOREAN_IME_DESCRIPTION, kOsCrOS, |
| SINGLE_DISABLE_VALUE_TYPE(chromeos::switches::kDisableNewKoreanIme)}, |
| {"enable-physical-keyboard-autocorrect", |
| IDS_FLAGS_PHYSICAL_KEYBOARD_AUTOCORRECT_NAME, |
| - IDS_FLAGS_PHYSICAL_KEYBOARD_AUTOCORRECT_DESCRIPTION, |
| - kOsCrOS, |
| + IDS_FLAGS_PHYSICAL_KEYBOARD_AUTOCORRECT_DESCRIPTION, kOsCrOS, |
| ENABLE_DISABLE_VALUE_TYPE( |
| chromeos::switches::kEnablePhysicalKeyboardAutocorrect, |
| chromeos::switches::kDisablePhysicalKeyboardAutocorrect)}, |
| - {"disable-voice-input", |
| - IDS_FLAGS_VOICE_INPUT_NAME, |
| - IDS_FLAGS_VOICE_INPUT_DESCRIPTION, |
| - kOsCrOS, |
| + {"disable-voice-input", IDS_FLAGS_VOICE_INPUT_NAME, |
| + IDS_FLAGS_VOICE_INPUT_DESCRIPTION, kOsCrOS, |
| SINGLE_DISABLE_VALUE_TYPE(keyboard::switches::kDisableVoiceInput)}, |
| {"experimental-input-view-features", |
| IDS_FLAGS_EXPERIMENTAL_INPUT_VIEW_FEATURES_NAME, |
| - IDS_FLAGS_EXPERIMENTAL_INPUT_VIEW_FEATURES_DESCRIPTION, |
| - kOsCrOS, |
| + IDS_FLAGS_EXPERIMENTAL_INPUT_VIEW_FEATURES_DESCRIPTION, kOsCrOS, |
| SINGLE_VALUE_TYPE( |
| keyboard::switches::kEnableExperimentalInputViewFeatures)}, |
| - {"floating-virtual-keyboard", |
| - IDS_FLAGS_FLOATING_VIRTUAL_KEYBOARD_NAME, |
| - IDS_FLAGS_FLOATING_VIRTUAL_KEYBOARD_DESCRIPTION, |
| - kOsCrOS, |
| + {"floating-virtual-keyboard", IDS_FLAGS_FLOATING_VIRTUAL_KEYBOARD_NAME, |
| + IDS_FLAGS_FLOATING_VIRTUAL_KEYBOARD_DESCRIPTION, kOsCrOS, |
| SINGLE_VALUE_TYPE(keyboard::switches::kEnableFloatingVirtualKeyboard)}, |
| - {"smart-virtual-keyboard", |
| - IDS_FLAGS_SMART_VIRTUAL_KEYBOARD_NAME, |
| - IDS_FLAGS_SMART_VIRTUAL_KEYBOARD_DESCRIPTION, |
| - kOsCrOS, |
| + {"smart-virtual-keyboard", IDS_FLAGS_SMART_VIRTUAL_KEYBOARD_NAME, |
| + IDS_FLAGS_SMART_VIRTUAL_KEYBOARD_DESCRIPTION, kOsCrOS, |
| SINGLE_DISABLE_VALUE_TYPE( |
| keyboard::switches::kDisableSmartVirtualKeyboard)}, |
| - {"gesture-typing", |
| - IDS_FLAGS_GESTURE_TYPING_NAME, |
| - IDS_FLAGS_GESTURE_TYPING_DESCRIPTION, |
| - kOsCrOS, |
| + {"gesture-typing", IDS_FLAGS_GESTURE_TYPING_NAME, |
| + IDS_FLAGS_GESTURE_TYPING_DESCRIPTION, kOsCrOS, |
| SINGLE_DISABLE_VALUE_TYPE(keyboard::switches::kDisableGestureTyping)}, |
| - {"gesture-editing", |
| - IDS_FLAGS_GESTURE_EDITING_NAME, |
| - IDS_FLAGS_GESTURE_EDITING_DESCRIPTION, |
| - kOsCrOS, |
| + {"gesture-editing", IDS_FLAGS_GESTURE_EDITING_NAME, |
| + IDS_FLAGS_GESTURE_EDITING_DESCRIPTION, kOsCrOS, |
| SINGLE_DISABLE_VALUE_TYPE(keyboard::switches::kDisableGestureEditing)}, |
| - {"enable-fullscreen-app-list", |
| - IDS_FLAGS_FULLSCREEN_APP_LIST_NAME, |
| - IDS_FLAGS_FULLSCREEN_APP_LIST_DESCRIPTION, |
| - kOsCrOS, |
| + {"enable-fullscreen-app-list", IDS_FLAGS_FULLSCREEN_APP_LIST_NAME, |
| + IDS_FLAGS_FULLSCREEN_APP_LIST_DESCRIPTION, kOsCrOS, |
| SINGLE_VALUE_TYPE(ash::switches::kAshEnableFullscreenAppList)}, |
| #endif |
| - {"enable-simple-cache-backend", |
| - IDS_FLAGS_SIMPLE_CACHE_BACKEND_NAME, |
| + {"enable-simple-cache-backend", IDS_FLAGS_SIMPLE_CACHE_BACKEND_NAME, |
| IDS_FLAGS_SIMPLE_CACHE_BACKEND_DESCRIPTION, |
| kOsWin | kOsMac | kOsLinux | kOsCrOS, |
| MULTI_VALUE_TYPE(kSimpleCacheBackendChoices)}, |
| - {"enable-tcp-fast-open", |
| - IDS_FLAGS_TCP_FAST_OPEN_NAME, |
| - IDS_FLAGS_TCP_FAST_OPEN_DESCRIPTION, |
| - kOsLinux | kOsCrOS | kOsAndroid, |
| + {"enable-tcp-fast-open", IDS_FLAGS_TCP_FAST_OPEN_NAME, |
| + IDS_FLAGS_TCP_FAST_OPEN_DESCRIPTION, kOsLinux | kOsCrOS | kOsAndroid, |
| SINGLE_VALUE_TYPE(switches::kEnableTcpFastOpen)}, |
| #if defined(ENABLE_SERVICE_DISCOVERY) |
| {"device-discovery-notifications", |
| IDS_FLAGS_DEVICE_DISCOVERY_NOTIFICATIONS_NAME, |
| - IDS_FLAGS_DEVICE_DISCOVERY_NOTIFICATIONS_DESCRIPTION, |
| - kOsDesktop, |
| + IDS_FLAGS_DEVICE_DISCOVERY_NOTIFICATIONS_DESCRIPTION, kOsDesktop, |
| ENABLE_DISABLE_VALUE_TYPE(switches::kEnableDeviceDiscoveryNotifications, |
| switches::kDisableDeviceDiscoveryNotifications)}, |
| {"enable-print-preview-register-promos", |
| IDS_FLAGS_PRINT_PREVIEW_REGISTER_PROMOS_NAME, |
| - IDS_FLAGS_PRINT_PREVIEW_REGISTER_PROMOS_DESCRIPTION, |
| - kOsDesktop, |
| + IDS_FLAGS_PRINT_PREVIEW_REGISTER_PROMOS_DESCRIPTION, kOsDesktop, |
| SINGLE_VALUE_TYPE(switches::kEnablePrintPreviewRegisterPromos)}, |
| #endif // ENABLE_SERVICE_DISCOVERY |
| #if defined(ENABLE_PRINT_PREVIEW) |
| - {"enable-print-preview-simplify", |
| - IDS_FLAGS_DISTILLER_IN_PRINT_PREVIEW_NAME, |
| - IDS_FLAGS_DISTILLER_IN_PRINT_PREVIEW_DESCRIPTION, |
| - kOsDesktop, |
| + {"enable-print-preview-simplify", IDS_FLAGS_DISTILLER_IN_PRINT_PREVIEW_NAME, |
| + IDS_FLAGS_DISTILLER_IN_PRINT_PREVIEW_DESCRIPTION, kOsDesktop, |
| FEATURE_VALUE_TYPE(PrintPreviewDistiller::kFeature)}, |
| #endif |
| #if defined(OS_WIN) |
| - {"enable-cloud-print-xps", |
| - IDS_FLAGS_CLOUD_PRINT_XPS_NAME, |
| - IDS_FLAGS_CLOUD_PRINT_XPS_DESCRIPTION, |
| - kOsWin, |
| + {"enable-cloud-print-xps", IDS_FLAGS_CLOUD_PRINT_XPS_NAME, |
| + IDS_FLAGS_CLOUD_PRINT_XPS_DESCRIPTION, kOsWin, |
| SINGLE_VALUE_TYPE(switches::kEnableCloudPrintXps)}, |
| #endif |
| #if defined(USE_AURA) |
| - {"tab-capture-upscale-quality", |
| - IDS_FLAGS_TAB_CAPTURE_UPSCALE_QUALITY_NAME, |
| - IDS_FLAGS_TAB_CAPTURE_UPSCALE_QUALITY_DESCRIPTION, |
| - kOsAll, |
| + {"tab-capture-upscale-quality", IDS_FLAGS_TAB_CAPTURE_UPSCALE_QUALITY_NAME, |
| + IDS_FLAGS_TAB_CAPTURE_UPSCALE_QUALITY_DESCRIPTION, kOsAll, |
| MULTI_VALUE_TYPE(kTabCaptureUpscaleQualityChoices)}, |
| {"tab-capture-downscale-quality", |
| IDS_FLAGS_TAB_CAPTURE_DOWNSCALE_QUALITY_NAME, |
| - IDS_FLAGS_TAB_CAPTURE_DOWNSCALE_QUALITY_DESCRIPTION, |
| - kOsAll, |
| + IDS_FLAGS_TAB_CAPTURE_DOWNSCALE_QUALITY_DESCRIPTION, kOsAll, |
| MULTI_VALUE_TYPE(kTabCaptureDownscaleQualityChoices)}, |
| #endif |
| #if defined(TOOLKIT_VIEWS) |
| @@ -1276,23 +1086,18 @@ const FeatureEntry kFeatureEntries[] = { |
| #if defined(ENABLE_SPELLCHECK) |
| {"enable-spelling-feedback-field-trial", |
| IDS_FLAGS_SPELLING_FEEDBACK_FIELD_TRIAL_NAME, |
| - IDS_FLAGS_SPELLING_FEEDBACK_FIELD_TRIAL_DESCRIPTION, |
| - kOsAll, |
| + IDS_FLAGS_SPELLING_FEEDBACK_FIELD_TRIAL_DESCRIPTION, kOsAll, |
| SINGLE_VALUE_TYPE(switches::kEnableSpellingFeedbackFieldTrial)}, |
| #endif |
| - {"enable-webgl-draft-extensions", |
| - IDS_FLAGS_WEBGL_DRAFT_EXTENSIONS_NAME, |
| - IDS_FLAGS_WEBGL_DRAFT_EXTENSIONS_DESCRIPTION, |
| - kOsAll, |
| + {"enable-webgl-draft-extensions", IDS_FLAGS_WEBGL_DRAFT_EXTENSIONS_NAME, |
| + IDS_FLAGS_WEBGL_DRAFT_EXTENSIONS_DESCRIPTION, kOsAll, |
| SINGLE_VALUE_TYPE(switches::kEnableWebGLDraftExtensions)}, |
| - {"enable-new-profile-management", |
| - IDS_FLAGS_NEW_PROFILE_MANAGEMENT_NAME, |
| + {"enable-new-profile-management", IDS_FLAGS_NEW_PROFILE_MANAGEMENT_NAME, |
| IDS_FLAGS_NEW_PROFILE_MANAGEMENT_DESCRIPTION, |
| kOsAndroid | kOsMac | kOsWin | kOsLinux | kOsCrOS, |
| ENABLE_DISABLE_VALUE_TYPE(switches::kEnableNewProfileManagement, |
| switches::kDisableNewProfileManagement)}, |
| - {"enable-account-consistency", |
| - IDS_FLAGS_ACCOUNT_CONSISTENCY_NAME, |
| + {"enable-account-consistency", IDS_FLAGS_ACCOUNT_CONSISTENCY_NAME, |
| IDS_FLAGS_ACCOUNT_CONSISTENCY_DESCRIPTION, |
| kOsAndroid | kOsMac | kOsWin | kOsLinux | kOsCrOS, |
| ENABLE_DISABLE_VALUE_TYPE(switches::kEnableAccountConsistency, |
| @@ -1303,10 +1108,8 @@ const FeatureEntry kFeatureEntries[] = { |
| kOsWin | kOsLinux, |
| ENABLE_DISABLE_VALUE_TYPE(switches::kEnablePasswordSeparatedSigninFlow, |
| switches::kDisablePasswordSeparatedSigninFlow)}, |
| - {"enable-google-profile-info", |
| - IDS_FLAGS_GOOGLE_PROFILE_INFO_NAME, |
| - IDS_FLAGS_GOOGLE_PROFILE_INFO_DESCRIPTION, |
| - kOsMac | kOsWin | kOsLinux, |
| + {"enable-google-profile-info", IDS_FLAGS_GOOGLE_PROFILE_INFO_NAME, |
| + IDS_FLAGS_GOOGLE_PROFILE_INFO_DESCRIPTION, kOsMac | kOsWin | kOsLinux, |
| SINGLE_VALUE_TYPE(switches::kGoogleProfileInfo)}, |
| #if defined(ENABLE_APP_LIST) |
| {"reset-app-list-install-state", |
| @@ -1318,64 +1121,48 @@ const FeatureEntry kFeatureEntries[] = { |
| #if defined(OS_ANDROID) |
| {"enable-accessibility-tab-switcher", |
| IDS_FLAGS_ACCESSIBILITY_TAB_SWITCHER_NAME, |
| - IDS_FLAGS_ACCESSIBILITY_TAB_SWITCHER_DESCRIPTION, |
| - kOsAndroid, |
| + IDS_FLAGS_ACCESSIBILITY_TAB_SWITCHER_DESCRIPTION, kOsAndroid, |
| SINGLE_VALUE_TYPE(switches::kEnableAccessibilityTabSwitcher)}, |
| - {"enable-physical-web", |
| - IDS_FLAGS_ENABLE_PHYSICAL_WEB_NAME, |
| - IDS_FLAGS_ENABLE_PHYSICAL_WEB_DESCRIPTION, |
| - kOsAndroid, |
| + {"enable-physical-web", IDS_FLAGS_ENABLE_PHYSICAL_WEB_NAME, |
| + IDS_FLAGS_ENABLE_PHYSICAL_WEB_DESCRIPTION, kOsAndroid, |
| SINGLE_VALUE_TYPE(switches::kEnablePhysicalWeb)}, |
| #endif |
| - {"enable-zero-copy", |
| - IDS_FLAGS_ZERO_COPY_NAME, |
| - IDS_FLAGS_ZERO_COPY_DESCRIPTION, |
| - kOsAll, |
| + {"enable-zero-copy", IDS_FLAGS_ZERO_COPY_NAME, |
| + IDS_FLAGS_ZERO_COPY_DESCRIPTION, kOsAll, |
| ENABLE_DISABLE_VALUE_TYPE(switches::kEnableZeroCopy, |
| switches::kDisableZeroCopy)}, |
| #if defined(OS_CHROMEOS) |
| - {"enable-first-run-ui-transitions", |
| - IDS_FLAGS_FIRST_RUN_UI_TRANSITIONS_NAME, |
| - IDS_FLAGS_FIRST_RUN_UI_TRANSITIONS_DESCRIPTION, |
| - kOsCrOS, |
| + {"enable-first-run-ui-transitions", IDS_FLAGS_FIRST_RUN_UI_TRANSITIONS_NAME, |
| + IDS_FLAGS_FIRST_RUN_UI_TRANSITIONS_DESCRIPTION, kOsCrOS, |
| SINGLE_VALUE_TYPE(chromeos::switches::kEnableFirstRunUITransitions)}, |
| #endif |
| - {"disable-new-bookmark-apps", |
| - IDS_FLAGS_NEW_BOOKMARK_APPS_NAME, |
| + {"disable-new-bookmark-apps", IDS_FLAGS_NEW_BOOKMARK_APPS_NAME, |
| IDS_FLAGS_NEW_BOOKMARK_APPS_DESCRIPTION, |
| kOsWin | kOsCrOS | kOsLinux | kOsMac, |
| ENABLE_DISABLE_VALUE_TYPE(switches::kEnableNewBookmarkApps, |
| switches::kDisableNewBookmarkApps)}, |
| #if defined(OS_MACOSX) |
| - {"disable-hosted-apps-in-windows", |
| - IDS_FLAGS_HOSTED_APPS_IN_WINDOWS_NAME, |
| - IDS_FLAGS_HOSTED_APPS_IN_WINDOWS_DESCRIPTION, |
| - kOsMac, |
| + {"disable-hosted-apps-in-windows", IDS_FLAGS_HOSTED_APPS_IN_WINDOWS_NAME, |
| + IDS_FLAGS_HOSTED_APPS_IN_WINDOWS_DESCRIPTION, kOsMac, |
| ENABLE_DISABLE_VALUE_TYPE(switches::kEnableHostedAppsInWindows, |
| switches::kDisableHostedAppsInWindows)}, |
| {"disable-hosted-app-shim-creation", |
| IDS_FLAGS_HOSTED_APP_SHIM_CREATION_NAME, |
| - IDS_FLAGS_HOSTED_APP_SHIM_CREATION_DESCRIPTION, |
| - kOsMac, |
| + IDS_FLAGS_HOSTED_APP_SHIM_CREATION_DESCRIPTION, kOsMac, |
| SINGLE_DISABLE_VALUE_TYPE(switches::kDisableHostedAppShimCreation)}, |
| {"enable-hosted-app-quit-notification", |
| IDS_FLAGS_HOSTED_APP_QUIT_NOTIFICATION_NAME, |
| - IDS_FLAGS_HOSTED_APP_QUIT_NOTIFICATION_DESCRIPTION, |
| - kOsMac, |
| + IDS_FLAGS_HOSTED_APP_QUIT_NOTIFICATION_DESCRIPTION, kOsMac, |
| SINGLE_VALUE_TYPE(switches::kHostedAppQuitNotification)}, |
| #endif |
| #if defined(OS_ANDROID) |
| - {"disable-pull-to-refresh-effect", |
| - IDS_FLAGS_PULL_TO_REFRESH_EFFECT_NAME, |
| - IDS_FLAGS_PULL_TO_REFRESH_EFFECT_DESCRIPTION, |
| - kOsAndroid, |
| + {"disable-pull-to-refresh-effect", IDS_FLAGS_PULL_TO_REFRESH_EFFECT_NAME, |
| + IDS_FLAGS_PULL_TO_REFRESH_EFFECT_DESCRIPTION, kOsAndroid, |
| SINGLE_DISABLE_VALUE_TYPE(switches::kDisablePullToRefreshEffect)}, |
| #endif |
| #if defined(OS_MACOSX) |
| - {"enable-translate-new-ux", |
| - IDS_FLAGS_TRANSLATE_NEW_UX_NAME, |
| - IDS_FLAGS_TRANSLATE_NEW_UX_DESCRIPTION, |
| - kOsMac, |
| + {"enable-translate-new-ux", IDS_FLAGS_TRANSLATE_NEW_UX_NAME, |
| + IDS_FLAGS_TRANSLATE_NEW_UX_DESCRIPTION, kOsMac, |
| ENABLE_DISABLE_VALUE_TYPE(switches::kEnableTranslateNewUX, |
| switches::kDisableTranslateNewUX)}, |
| #endif |
| @@ -1388,200 +1175,149 @@ const FeatureEntry kFeatureEntries[] = { |
| views::switches::kDisableViewsRectBasedTargeting)}, |
| {"enable-link-disambiguation-popup", |
| IDS_FLAGS_LINK_DISAMBIGUATION_POPUP_NAME, |
| - IDS_FLAGS_LINK_DISAMBIGUATION_POPUP_DESCRIPTION, |
| - kOsCrOS | kOsWin, |
| + IDS_FLAGS_LINK_DISAMBIGUATION_POPUP_DESCRIPTION, kOsCrOS | kOsWin, |
| SINGLE_VALUE_TYPE(switches::kEnableLinkDisambiguationPopup)}, |
| #endif |
| #if defined(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, |
| + {"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)}, |
| #endif |
| - {"enhanced-bookmarks-experiment", |
| - IDS_FLAGS_ENHANCED_BOOKMARKS_NAME, |
| - IDS_FLAGS_ENHANCED_BOOKMARKS_DESCRIPTION, |
| - kOsDesktop | kOsAndroid, |
| + {"enhanced-bookmarks-experiment", IDS_FLAGS_ENHANCED_BOOKMARKS_NAME, |
| + IDS_FLAGS_ENHANCED_BOOKMARKS_DESCRIPTION, kOsDesktop | kOsAndroid, |
| ENABLE_DISABLE_VALUE_TYPE_AND_VALUE(switches::kEnhancedBookmarksExperiment, |
| "1", |
| switches::kEnhancedBookmarksExperiment, |
| "0")}, |
| #if defined(OS_ANDROID) |
| - {"reader-mode-heuristics", |
| - IDS_FLAGS_READER_MODE_HEURISTICS_NAME, |
| - IDS_FLAGS_READER_MODE_HEURISTICS_DESCRIPTION, |
| - kOsAndroid, |
| + {"reader-mode-heuristics", IDS_FLAGS_READER_MODE_HEURISTICS_NAME, |
| + IDS_FLAGS_READER_MODE_HEURISTICS_DESCRIPTION, kOsAndroid, |
| MULTI_VALUE_TYPE(kReaderModeHeuristicsChoices)}, |
| {"enable-dom-distiller-button-animation", |
| IDS_FLAGS_READER_MODE_BUTTON_ANIMATION, |
| - IDS_FLAGS_READER_MODE_BUTTON_ANIMATION_DESCRIPTION, |
| - kOsAndroid, |
| + IDS_FLAGS_READER_MODE_BUTTON_ANIMATION_DESCRIPTION, kOsAndroid, |
| SINGLE_VALUE_TYPE(switches::kEnableDomDistillerButtonAnimation)}, |
| #endif |
| - {"num-raster-threads", |
| - IDS_FLAGS_NUM_RASTER_THREADS_NAME, |
| - IDS_FLAGS_NUM_RASTER_THREADS_DESCRIPTION, |
| - kOsAll, |
| + {"num-raster-threads", IDS_FLAGS_NUM_RASTER_THREADS_NAME, |
| + IDS_FLAGS_NUM_RASTER_THREADS_DESCRIPTION, kOsAll, |
| MULTI_VALUE_TYPE(kNumRasterThreadsChoices)}, |
| - {"enable-permissions-blacklist", |
| - IDS_FLAGS_PERMISSIONS_BLACKLIST_NAME, |
| - IDS_FLAGS_PERMISSIONS_BLACKLIST_DESCRIPTION, |
| - kOsAll, |
| + {"enable-permissions-blacklist", IDS_FLAGS_PERMISSIONS_BLACKLIST_NAME, |
| + IDS_FLAGS_PERMISSIONS_BLACKLIST_DESCRIPTION, kOsAll, |
| ENABLE_DISABLE_VALUE_TYPE(switches::kEnablePermissionsBlacklist, |
| switches::kDisablePermissionsBlacklist)}, |
| - {"enable-single-click-autofill", |
| - IDS_FLAGS_SINGLE_CLICK_AUTOFILL_NAME, |
| + {"enable-single-click-autofill", IDS_FLAGS_SINGLE_CLICK_AUTOFILL_NAME, |
| IDS_FLAGS_SINGLE_CLICK_AUTOFILL_DESCRIPTION, |
| kOsCrOS | kOsMac | kOsWin | kOsLinux | kOsAndroid, |
| ENABLE_DISABLE_VALUE_TYPE( |
| autofill::switches::kEnableSingleClickAutofill, |
| autofill::switches::kDisableSingleClickAutofill)}, |
| - {"enable-site-engagement-service", |
| - IDS_FLAGS_SITE_ENGAGEMENT_SERVICE_NAME, |
| - IDS_FLAGS_SITE_ENGAGEMENT_SERVICE_DESCRIPTION, |
| - kOsAll, |
| + {"enable-site-engagement-service", IDS_FLAGS_SITE_ENGAGEMENT_SERVICE_NAME, |
| + IDS_FLAGS_SITE_ENGAGEMENT_SERVICE_DESCRIPTION, kOsAll, |
| ENABLE_DISABLE_VALUE_TYPE(switches::kEnableSiteEngagementService, |
| switches::kDisableSiteEngagementService)}, |
| - {"enable-session-crashed-bubble", |
| - IDS_FLAGS_SESSION_CRASHED_BUBBLE_NAME, |
| - IDS_FLAGS_SESSION_CRASHED_BUBBLE_DESCRIPTION, |
| - kOsWin | kOsLinux, |
| + {"enable-session-crashed-bubble", IDS_FLAGS_SESSION_CRASHED_BUBBLE_NAME, |
| + IDS_FLAGS_SESSION_CRASHED_BUBBLE_DESCRIPTION, kOsWin | kOsLinux, |
| ENABLE_DISABLE_VALUE_TYPE(switches::kEnableSessionCrashedBubble, |
| switches::kDisableSessionCrashedBubble)}, |
| {"disable-cast-streaming-hw-encoding", |
| IDS_FLAGS_CAST_STREAMING_HW_ENCODING_NAME, |
| - IDS_FLAGS_CAST_STREAMING_HW_ENCODING_DESCRIPTION, |
| - kOsAll, |
| + IDS_FLAGS_CAST_STREAMING_HW_ENCODING_DESCRIPTION, kOsAll, |
| SINGLE_DISABLE_VALUE_TYPE(switches::kDisableCastStreamingHWEncoding)}, |
| #if defined(OS_ANDROID) |
| - {"prefetch-search-results", |
| - IDS_FLAGS_PREFETCH_SEARCH_RESULTS_NAME, |
| - IDS_FLAGS_PREFETCH_SEARCH_RESULTS_DESCRIPTION, |
| - kOsAndroid, |
| + {"prefetch-search-results", IDS_FLAGS_PREFETCH_SEARCH_RESULTS_NAME, |
| + IDS_FLAGS_PREFETCH_SEARCH_RESULTS_DESCRIPTION, kOsAndroid, |
| SINGLE_VALUE_TYPE(switches::kPrefetchSearchResults)}, |
| #endif |
| #if defined(ENABLE_APP_LIST) |
| - {"enable-experimental-app-list", |
| - IDS_FLAGS_EXPERIMENTAL_APP_LIST_NAME, |
| - IDS_FLAGS_EXPERIMENTAL_APP_LIST_DESCRIPTION, |
| - kOsWin | kOsLinux | kOsCrOS, |
| + {"enable-experimental-app-list", IDS_FLAGS_EXPERIMENTAL_APP_LIST_NAME, |
| + IDS_FLAGS_EXPERIMENTAL_APP_LIST_DESCRIPTION, kOsWin | kOsLinux | kOsCrOS, |
| ENABLE_DISABLE_VALUE_TYPE( |
| app_list::switches::kEnableExperimentalAppList, |
| app_list::switches::kDisableExperimentalAppList)}, |
| - {"enable-centered-app-list", |
| - IDS_FLAGS_CENTERED_APP_LIST_NAME, |
| - IDS_FLAGS_CENTERED_APP_LIST_DESCRIPTION, |
| - kOsWin | kOsLinux | kOsCrOS, |
| + {"enable-centered-app-list", IDS_FLAGS_CENTERED_APP_LIST_NAME, |
| + IDS_FLAGS_CENTERED_APP_LIST_DESCRIPTION, kOsWin | kOsLinux | kOsCrOS, |
| SINGLE_VALUE_TYPE(app_list::switches::kEnableCenteredAppList)}, |
| - {"enable-new-app-list-mixer", |
| - IDS_FLAGS_NEW_APP_LIST_MIXER_NAME, |
| + {"enable-new-app-list-mixer", IDS_FLAGS_NEW_APP_LIST_MIXER_NAME, |
| IDS_FLAGS_NEW_APP_LIST_MIXER_DESCRIPTION, |
| kOsWin | kOsLinux | kOsCrOS | kOsMac, |
| ENABLE_DISABLE_VALUE_TYPE(app_list::switches::kEnableNewAppListMixer, |
| app_list::switches::kDisableNewAppListMixer)}, |
| #endif |
| - {"disable-threaded-scrolling", |
| - IDS_FLAGS_THREADED_SCROLLING_NAME, |
| + {"disable-threaded-scrolling", IDS_FLAGS_THREADED_SCROLLING_NAME, |
| IDS_FLAGS_THREADED_SCROLLING_DESCRIPTION, |
| kOsWin | kOsLinux | kOsCrOS | kOsAndroid | kOsMac, |
| SINGLE_DISABLE_VALUE_TYPE(switches::kDisableThreadedScrolling)}, |
| - {"enable-settings-window", |
| - IDS_FLAGS_SETTINGS_WINDOW_NAME, |
| - IDS_FLAGS_SETTINGS_WINDOW_DESCRIPTION, |
| - kOsDesktop, |
| + {"enable-settings-window", IDS_FLAGS_SETTINGS_WINDOW_NAME, |
| + IDS_FLAGS_SETTINGS_WINDOW_DESCRIPTION, kOsDesktop, |
| ENABLE_DISABLE_VALUE_TYPE(switches::kEnableSettingsWindow, |
| switches::kDisableSettingsWindow)}, |
| #if defined(OS_MACOSX) |
| - {"enable-save-password-bubble", |
| - IDS_FLAGS_SAVE_PASSWORD_BUBBLE_NAME, |
| - IDS_FLAGS_SAVE_PASSWORD_BUBBLE_DESCRIPTION, |
| - kOsMac, |
| + {"enable-save-password-bubble", IDS_FLAGS_SAVE_PASSWORD_BUBBLE_NAME, |
| + IDS_FLAGS_SAVE_PASSWORD_BUBBLE_DESCRIPTION, kOsMac, |
| ENABLE_DISABLE_VALUE_TYPE(switches::kEnableSavePasswordBubble, |
| switches::kDisableSavePasswordBubble)}, |
| #endif |
| - {"enable-apps-file-associations", |
| - IDS_FLAGS_APPS_FILE_ASSOCIATIONS_NAME, |
| - IDS_FLAGS_APPS_FILE_ASSOCIATIONS_DESCRIPTION, |
| - kOsMac, |
| + {"enable-apps-file-associations", IDS_FLAGS_APPS_FILE_ASSOCIATIONS_NAME, |
| + IDS_FLAGS_APPS_FILE_ASSOCIATIONS_DESCRIPTION, kOsMac, |
| SINGLE_VALUE_TYPE(switches::kEnableAppsFileAssociations)}, |
| #if defined(OS_ANDROID) |
| - {"enable-embeddedsearch-api", |
| - IDS_FLAGS_EMBEDDEDSEARCH_API_NAME, |
| - IDS_FLAGS_EMBEDDEDSEARCH_API_DESCRIPTION, |
| - kOsAndroid, |
| + {"enable-embeddedsearch-api", IDS_FLAGS_EMBEDDEDSEARCH_API_NAME, |
| + IDS_FLAGS_EMBEDDEDSEARCH_API_DESCRIPTION, kOsAndroid, |
| SINGLE_VALUE_TYPE(switches::kEnableEmbeddedSearchAPI)}, |
| #endif |
| - {"distance-field-text", |
| - IDS_FLAGS_DISTANCE_FIELD_TEXT_NAME, |
| - IDS_FLAGS_DISTANCE_FIELD_TEXT_DESCRIPTION, |
| - kOsAll, |
| + {"distance-field-text", IDS_FLAGS_DISTANCE_FIELD_TEXT_NAME, |
| + IDS_FLAGS_DISTANCE_FIELD_TEXT_DESCRIPTION, kOsAll, |
| ENABLE_DISABLE_VALUE_TYPE(switches::kEnableDistanceFieldText, |
| switches::kDisableDistanceFieldText)}, |
| {"extension-content-verification", |
| IDS_FLAGS_EXTENSION_CONTENT_VERIFICATION_NAME, |
| - IDS_FLAGS_EXTENSION_CONTENT_VERIFICATION_DESCRIPTION, |
| - kOsDesktop, |
| + IDS_FLAGS_EXTENSION_CONTENT_VERIFICATION_DESCRIPTION, kOsDesktop, |
| MULTI_VALUE_TYPE(kExtensionContentVerificationChoices)}, |
| #if defined(ENABLE_EXTENSIONS) |
| {"extension-active-script-permission", |
| IDS_FLAGS_USER_CONSENT_FOR_EXTENSION_SCRIPTS_NAME, |
| - IDS_FLAGS_USER_CONSENT_FOR_EXTENSION_SCRIPTS_DESCRIPTION, |
| - kOsAll, |
| + IDS_FLAGS_USER_CONSENT_FOR_EXTENSION_SCRIPTS_DESCRIPTION, kOsAll, |
| SINGLE_VALUE_TYPE(extensions::switches::kEnableScriptsRequireAction)}, |
| #endif |
| #if defined(OS_ANDROID) |
| - {"enable-data-reduction-proxy-dev", |
| - IDS_FLAGS_DATA_REDUCTION_PROXY_DEV_NAME, |
| - IDS_FLAGS_DATA_REDUCTION_PROXY_DEV_DESCRIPTION, |
| - kOsAndroid, |
| + {"enable-data-reduction-proxy-dev", IDS_FLAGS_DATA_REDUCTION_PROXY_DEV_NAME, |
| + IDS_FLAGS_DATA_REDUCTION_PROXY_DEV_DESCRIPTION, kOsAndroid, |
| ENABLE_DISABLE_VALUE_TYPE( |
| data_reduction_proxy::switches::kEnableDataReductionProxyDev, |
| data_reduction_proxy::switches::kDisableDataReductionProxyDev)}, |
| {"enable-data-reduction-proxy-carrier-test", |
| IDS_FLAGS_DATA_REDUCTION_PROXY_CARRIER_TEST_NAME, |
| - IDS_FLAGS_DATA_REDUCTION_PROXY_CARRIER_TEST_DESCRIPTION, |
| - kOsAndroid, |
| + IDS_FLAGS_DATA_REDUCTION_PROXY_CARRIER_TEST_DESCRIPTION, kOsAndroid, |
| SINGLE_VALUE_TYPE( |
| data_reduction_proxy::switches::kEnableDataReductionProxyCarrierTest)}, |
| #endif |
| - {"enable-hotword-hardware", |
| - IDS_FLAGS_EXPERIMENTAL_HOTWORD_HARDWARE_NAME, |
| - IDS_FLAGS_EXPERIMENTAL_HOTWORD_HARDWARE_DESCRIPTION, |
| - kOsCrOS, |
| + {"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) |
| {"enable-embedded-extension-options", |
| IDS_FLAGS_EMBEDDED_EXTENSION_OPTIONS_NAME, |
| - IDS_FLAGS_EMBEDDED_EXTENSION_OPTIONS_DESCRIPTION, |
| - kOsDesktop, |
| + IDS_FLAGS_EMBEDDED_EXTENSION_OPTIONS_DESCRIPTION, kOsDesktop, |
| SINGLE_VALUE_TYPE(extensions::switches::kEnableEmbeddedExtensionOptions)}, |
| #endif |
| #if defined(USE_ASH) |
| - {"enable-web-app-frame", |
| - IDS_FLAGS_WEB_APP_FRAME_NAME, |
| - IDS_FLAGS_WEB_APP_FRAME_DESCRIPTION, |
| - kOsWin | kOsCrOS, |
| + {"enable-web-app-frame", IDS_FLAGS_WEB_APP_FRAME_NAME, |
| + IDS_FLAGS_WEB_APP_FRAME_DESCRIPTION, kOsWin | kOsCrOS, |
| SINGLE_VALUE_TYPE(switches::kEnableWebAppFrame)}, |
| #endif |
| - {"enable-drop-sync-credential", |
| - IDS_FLAGS_DROP_SYNC_CREDENTIAL_NAME, |
| - IDS_FLAGS_DROP_SYNC_CREDENTIAL_DESCRIPTION, |
| - kOsAll, |
| + {"enable-drop-sync-credential", IDS_FLAGS_DROP_SYNC_CREDENTIAL_NAME, |
| + IDS_FLAGS_DROP_SYNC_CREDENTIAL_DESCRIPTION, kOsAll, |
| ENABLE_DISABLE_VALUE_TYPE( |
| password_manager::switches::kEnableDropSyncCredential, |
| password_manager::switches::kDisableDropSyncCredential)}, |
| #if defined(ENABLE_EXTENSIONS) |
| {"enable-extension-action-redesign", |
| IDS_FLAGS_EXTENSION_ACTION_REDESIGN_NAME, |
| - IDS_FLAGS_EXTENSION_ACTION_REDESIGN_DESCRIPTION, |
| - kOsDesktop, |
| + IDS_FLAGS_EXTENSION_ACTION_REDESIGN_DESCRIPTION, kOsDesktop, |
| SINGLE_VALUE_TYPE(extensions::switches::kEnableExtensionActionRedesign)}, |
| #endif |
| - {"autofill-sync-credential", |
| - IDS_FLAGS_AUTOFILL_SYNC_CREDENTIAL_NAME, |
| - IDS_FLAGS_AUTOFILL_SYNC_CREDENTIAL_DESCRIPTION, |
| - kOsAll, |
| + {"autofill-sync-credential", IDS_FLAGS_AUTOFILL_SYNC_CREDENTIAL_NAME, |
| + IDS_FLAGS_AUTOFILL_SYNC_CREDENTIAL_DESCRIPTION, kOsAll, |
| MULTI_VALUE_TYPE(kAutofillSyncCredentialChoices)}, |
| #if !defined(OS_ANDROID) |
| {"enable-message-center-always-scroll-up-upon-notification-removal", |
| @@ -1591,179 +1327,132 @@ const FeatureEntry kFeatureEntries[] = { |
| SINGLE_VALUE_TYPE( |
| switches::kEnableMessageCenterAlwaysScrollUpUponNotificationRemoval)}, |
| #endif |
| - {"enable-md-policy-page", |
| - IDS_FLAGS_ENABLE_MATERIAL_DESIGN_POLICY_PAGE_NAME, |
| - IDS_FLAGS_ENABLE_MATERIAL_DESIGN_POLICY_PAGE_DESCRIPTION, |
| - kOsDesktop, |
| + {"enable-md-policy-page", IDS_FLAGS_ENABLE_MATERIAL_DESIGN_POLICY_PAGE_NAME, |
| + IDS_FLAGS_ENABLE_MATERIAL_DESIGN_POLICY_PAGE_DESCRIPTION, kOsDesktop, |
| SINGLE_VALUE_TYPE(switches::kEnableMaterialDesignPolicyPage)}, |
| #if defined(OS_CHROMEOS) |
| - {"memory-pressure-thresholds", |
| - IDS_FLAGS_MEMORY_PRESSURE_THRESHOLD_NAME, |
| - IDS_FLAGS_MEMORY_PRESSURE_THRESHOLD_DESCRIPTION, |
| - kOsCrOS, |
| + {"memory-pressure-thresholds", IDS_FLAGS_MEMORY_PRESSURE_THRESHOLD_NAME, |
| + IDS_FLAGS_MEMORY_PRESSURE_THRESHOLD_DESCRIPTION, kOsCrOS, |
| MULTI_VALUE_TYPE(kMemoryPressureThresholdChoices)}, |
| - {"wake-on-wifi-packet", |
| - IDS_FLAGS_WAKE_ON_PACKETS_NAME, |
| - IDS_FLAGS_WAKE_ON_PACKETS_DESCRIPTION, |
| - kOsCrOSOwnerOnly, |
| + {"wake-on-wifi-packet", IDS_FLAGS_WAKE_ON_PACKETS_NAME, |
| + IDS_FLAGS_WAKE_ON_PACKETS_DESCRIPTION, kOsCrOSOwnerOnly, |
| SINGLE_VALUE_TYPE(chromeos::switches::kWakeOnWifiPacket)}, |
| #endif // OS_CHROMEOS |
| - {"enable-tab-audio-muting", |
| - IDS_FLAGS_TAB_AUDIO_MUTING_NAME, |
| - IDS_FLAGS_TAB_AUDIO_MUTING_DESCRIPTION, |
| - kOsDesktop, |
| + {"enable-tab-audio-muting", IDS_FLAGS_TAB_AUDIO_MUTING_NAME, |
| + IDS_FLAGS_TAB_AUDIO_MUTING_DESCRIPTION, kOsDesktop, |
| SINGLE_VALUE_TYPE(switches::kEnableTabAudioMuting)}, |
| - {"enable-credential-manager-api", |
| - IDS_FLAGS_CREDENTIAL_MANAGER_API_NAME, |
| - IDS_FLAGS_CREDENTIAL_MANAGER_API_DESCRIPTION, |
| - kOsAll, |
| + {"enable-credential-manager-api", IDS_FLAGS_CREDENTIAL_MANAGER_API_NAME, |
| + IDS_FLAGS_CREDENTIAL_MANAGER_API_DESCRIPTION, kOsAll, |
| SINGLE_VALUE_TYPE(switches::kEnableCredentialManagerAPI)}, |
| {"reduced-referrer-granularity", |
| IDS_FLAGS_REDUCED_REFERRER_GRANULARITY_NAME, |
| - IDS_FLAGS_REDUCED_REFERRER_GRANULARITY_DESCRIPTION, |
| - kOsAll, |
| + IDS_FLAGS_REDUCED_REFERRER_GRANULARITY_DESCRIPTION, kOsAll, |
| SINGLE_VALUE_TYPE(switches::kReducedReferrerGranularity)}, |
| #if defined(OS_CHROMEOS) |
| - {"disable-new-zip-unpacker", |
| - IDS_FLAGS_NEW_ZIP_UNPACKER_NAME, |
| - IDS_FLAGS_NEW_ZIP_UNPACKER_DESCRIPTION, |
| - kOsCrOS, |
| + {"disable-new-zip-unpacker", IDS_FLAGS_NEW_ZIP_UNPACKER_NAME, |
| + IDS_FLAGS_NEW_ZIP_UNPACKER_DESCRIPTION, kOsCrOS, |
| SINGLE_DISABLE_VALUE_TYPE(chromeos::switches::kDisableNewZIPUnpacker)}, |
| #endif // defined(OS_CHROMEOS) |
| - {"enable-credit-card-scan", |
| - IDS_FLAGS_CREDIT_CARD_SCAN_NAME, |
| - IDS_FLAGS_CREDIT_CARD_SCAN_DESCRIPTION, |
| - kOsAndroid, |
| + {"enable-credit-card-scan", IDS_FLAGS_CREDIT_CARD_SCAN_NAME, |
| + IDS_FLAGS_CREDIT_CARD_SCAN_DESCRIPTION, kOsAndroid, |
| ENABLE_DISABLE_VALUE_TYPE(autofill::switches::kEnableCreditCardScan, |
| autofill::switches::kDisableCreditCardScan)}, |
| #if defined(OS_CHROMEOS) |
| {"disable-captive-portal-bypass-proxy", |
| IDS_FLAGS_CAPTIVE_PORTAL_BYPASS_PROXY_NAME, |
| - IDS_FLAGS_CAPTIVE_PORTAL_BYPASS_PROXY_DESCRIPTION, |
| - kOsCrOS, |
| + IDS_FLAGS_CAPTIVE_PORTAL_BYPASS_PROXY_DESCRIPTION, kOsCrOS, |
| SINGLE_DISABLE_VALUE_TYPE( |
| chromeos::switches::kDisableCaptivePortalBypassProxy)}, |
| #endif // defined(OS_CHROMEOS) |
| #if defined(OS_ANDROID) |
| {"enable-seccomp-sandbox-android", |
| IDS_FLAGS_SECCOMP_FILTER_SANDBOX_ANDROID_NAME, |
| - IDS_FLAGS_SECCOMP_FILTER_SANDBOX_ANDROID_DESCRIPTION, |
| - kOsAndroid, |
| + IDS_FLAGS_SECCOMP_FILTER_SANDBOX_ANDROID_DESCRIPTION, kOsAndroid, |
| FEATURE_VALUE_TYPE(features::kSeccompSandboxAndroid)}, |
| #endif |
| - {"enable-touch-hover", |
| - IDS_FLAGS_TOUCH_HOVER_NAME, |
| - IDS_FLAGS_TOUCH_HOVER_DESCRIPTION, |
| - kOsAndroid, |
| + {"enable-touch-hover", IDS_FLAGS_TOUCH_HOVER_NAME, |
| + IDS_FLAGS_TOUCH_HOVER_DESCRIPTION, kOsAndroid, |
| SINGLE_VALUE_TYPE("enable-touch-hover")}, |
| - {"enable-fill-on-account-select", |
| - IDS_FILL_ON_ACCOUNT_SELECT_NAME, |
| - IDS_FILL_ON_ACCOUNT_SELECT_DESCRIPTION, |
| - kOsAll, |
| + {"enable-fill-on-account-select", IDS_FILL_ON_ACCOUNT_SELECT_NAME, |
| + IDS_FILL_ON_ACCOUNT_SELECT_DESCRIPTION, kOsAll, |
| MULTI_VALUE_TYPE(kFillOnAccountSelectChoices)}, |
| #if defined(OS_CHROMEOS) |
| {"enable-wifi-credential-sync", // FLAGS:RECORD_UMA |
| IDS_FLAGS_WIFI_CREDENTIAL_SYNC_NAME, |
| - IDS_FLAGS_WIFI_CREDENTIAL_SYNC_DESCRIPTION, |
| - kOsCrOS, |
| + IDS_FLAGS_WIFI_CREDENTIAL_SYNC_DESCRIPTION, kOsCrOS, |
| SINGLE_VALUE_TYPE(switches::kEnableWifiCredentialSync)}, |
| {"enable-potentially-annoying-security-features", |
| IDS_FLAGS_EXPERIMENTAL_SECURITY_FEATURES_NAME, |
| - IDS_FLAGS_EXPERIMENTAL_SECURITY_FEATURES_DESCRIPTION, |
| - kOsAll, |
| + IDS_FLAGS_EXPERIMENTAL_SECURITY_FEATURES_DESCRIPTION, kOsAll, |
| SINGLE_VALUE_TYPE(switches::kEnablePotentiallyAnnoyingSecurityFeatures)}, |
| #endif |
| - {"disable-delay-agnostic-aec", |
| - IDS_FLAGS_DISABLE_DELAY_AGNOSTIC_AEC_NAME, |
| + {"disable-delay-agnostic-aec", IDS_FLAGS_DISABLE_DELAY_AGNOSTIC_AEC_NAME, |
| IDS_FLAGS_DISABLE_DELAY_AGNOSTIC_AEC_DESCRIPTION, |
| kOsWin | kOsLinux | kOsCrOS | kOsMac, |
| SINGLE_DISABLE_VALUE_TYPE(switches::kDisableDelayAgnosticAec)}, |
| {"mark-non-secure-as", // FLAGS:RECORD_UMA |
| - IDS_MARK_NON_SECURE_AS_NAME, |
| - IDS_MARK_NON_SECURE_AS_DESCRIPTION, |
| - kOsAll, |
| + IDS_MARK_NON_SECURE_AS_NAME, IDS_MARK_NON_SECURE_AS_DESCRIPTION, kOsAll, |
| MULTI_VALUE_TYPE(kMarkNonSecureAsChoices)}, |
| - {"enable-site-per-process", |
| - IDS_FLAGS_SITE_PER_PROCESS_NAME, |
| - IDS_FLAGS_SITE_PER_PROCESS_DESCRIPTION, |
| - kOsAll, |
| + {"enable-site-per-process", IDS_FLAGS_SITE_PER_PROCESS_NAME, |
| + IDS_FLAGS_SITE_PER_PROCESS_DESCRIPTION, kOsAll, |
| SINGLE_VALUE_TYPE(switches::kSitePerProcess)}, |
| - {"enable-use-zoom-for-dsf", |
| - IDS_FLAGS_ENABLE_USE_ZOOM_FOR_DSF_NAME, |
| - IDS_FLAGS_ENABLE_USE_ZOOM_FOR_DSF_DESCRIPTION, |
| - kOsDesktop, |
| + {"enable-use-zoom-for-dsf", IDS_FLAGS_ENABLE_USE_ZOOM_FOR_DSF_NAME, |
| + IDS_FLAGS_ENABLE_USE_ZOOM_FOR_DSF_DESCRIPTION, kOsDesktop, |
| SINGLE_VALUE_TYPE(switches::kEnableUseZoomForDSF)}, |
| #if defined(OS_MACOSX) |
| - {"enable-harfbuzz-rendertext", |
| - IDS_FLAGS_HARFBUZZ_RENDERTEXT_NAME, |
| - IDS_FLAGS_HARFBUZZ_RENDERTEXT_DESCRIPTION, |
| - kOsMac, |
| + {"enable-harfbuzz-rendertext", IDS_FLAGS_HARFBUZZ_RENDERTEXT_NAME, |
| + IDS_FLAGS_HARFBUZZ_RENDERTEXT_DESCRIPTION, kOsMac, |
| SINGLE_VALUE_TYPE(switches::kEnableHarfBuzzRenderText)}, |
| #endif // defined(OS_MACOSX) |
| #if defined(OS_CHROMEOS) |
| {"disable-timezone-tracking", |
| IDS_FLAGS_RESOLVE_TIMEZONE_BY_GEOLOCATION_NAME, |
| - IDS_FLAGS_RESOLVE_TIMEZONE_BY_GEOLOCATION_DESCRIPTION, |
| - kOsCrOS, |
| + IDS_FLAGS_RESOLVE_TIMEZONE_BY_GEOLOCATION_DESCRIPTION, kOsCrOS, |
| SINGLE_DISABLE_VALUE_TYPE( |
| chromeos::switches::kDisableTimeZoneTrackingOption)}, |
| #endif // defined(OS_CHROMEOS) |
| - {"data-reduction-proxy-lo-fi", |
| - IDS_FLAGS_DATA_REDUCTION_PROXY_LO_FI_NAME, |
| - IDS_FLAGS_DATA_REDUCTION_PROXY_LO_FI_DESCRIPTION, |
| - kOsAll, |
| + {"data-reduction-proxy-lo-fi", IDS_FLAGS_DATA_REDUCTION_PROXY_LO_FI_NAME, |
| + IDS_FLAGS_DATA_REDUCTION_PROXY_LO_FI_DESCRIPTION, kOsAll, |
| MULTI_VALUE_TYPE(kDataReductionProxyLoFiChoices)}, |
| {"enable-data-reduction-proxy-lo-fi-preview", |
| IDS_FLAGS_ENABLE_DATA_REDUCTION_PROXY_LO_FI_PREVIEW_NAME, |
| - IDS_FLAGS_ENABLE_DATA_REDUCTION_PROXY_LO_FI_PREVIEW_DESCRIPTION, |
| - kOsAll, |
| + IDS_FLAGS_ENABLE_DATA_REDUCTION_PROXY_LO_FI_PREVIEW_DESCRIPTION, kOsAll, |
| SINGLE_VALUE_TYPE( |
| data_reduction_proxy::switches::kEnableDataReductionProxyLoFiPreview)}, |
| {"clear-data-reduction-proxy-data-savings", |
| IDS_FLAGS_DATA_REDUCTION_PROXY_RESET_SAVINGS_NAME, |
| - IDS_FLAGS_DATA_REDUCTION_PROXY_RESET_SAVINGS_DESCRIPTION, |
| - kOsAll, |
| + IDS_FLAGS_DATA_REDUCTION_PROXY_RESET_SAVINGS_DESCRIPTION, kOsAll, |
| SINGLE_VALUE_TYPE( |
| data_reduction_proxy::switches::kClearDataReductionProxyDataSavings)}, |
| {"enable-data-reduction-proxy-config-client", |
| IDS_FLAGS_DATA_REDUCTION_PROXY_CONFIG_CLIENT_NAME, |
| - IDS_FLAGS_DATA_REDUCTION_PROXY_CONFIG_CLIENT_DESCRIPTION, |
| - kOsAll, |
| + IDS_FLAGS_DATA_REDUCTION_PROXY_CONFIG_CLIENT_DESCRIPTION, kOsAll, |
| SINGLE_VALUE_TYPE(data_reduction_proxy::switches:: |
| kEnableDataReductionProxyConfigClient)}, |
| #if defined(ENABLE_DATA_REDUCTION_PROXY_DEBUGGING) |
| {"enable-data-reduction-proxy-bypass-warnings", |
| IDS_FLAGS_DATA_REDUCTION_PROXY_BYPASS_WARNING_NAME, |
| - IDS_FLAGS_DATA_REDUCTION_PROXY_BYPASS_WARNING_DESCRIPTION, |
| - kOsAndroid, |
| + IDS_FLAGS_DATA_REDUCTION_PROXY_BYPASS_WARNING_DESCRIPTION, kOsAndroid, |
| SINGLE_VALUE_TYPE(data_reduction_proxy::switches:: |
| kEnableDataReductionProxyBypassWarning)}, |
| #endif |
| - {"allow-insecure-localhost", |
| - IDS_ALLOW_INSECURE_LOCALHOST, |
| - IDS_ALLOW_INSECURE_LOCALHOST_DESCRIPTION, |
| - kOsAll, |
| + {"allow-insecure-localhost", IDS_ALLOW_INSECURE_LOCALHOST, |
| + IDS_ALLOW_INSECURE_LOCALHOST_DESCRIPTION, kOsAll, |
| SINGLE_VALUE_TYPE(switches::kAllowInsecureLocalhost)}, |
| - {"enable-add-to-shelf", |
| - IDS_FLAGS_ADD_TO_SHELF_NAME, |
| - IDS_FLAGS_ADD_TO_SHELF_DESCRIPTION, |
| - kOsDesktop, |
| + {"enable-add-to-shelf", IDS_FLAGS_ADD_TO_SHELF_NAME, |
| + IDS_FLAGS_ADD_TO_SHELF_DESCRIPTION, kOsDesktop, |
| ENABLE_DISABLE_VALUE_TYPE(switches::kEnableAddToShelf, |
| switches::kDisableAddToShelf)}, |
| {"bypass-app-banner-engagement-checks", |
| IDS_FLAGS_BYPASS_APP_BANNER_ENGAGEMENT_CHECKS_NAME, |
| - IDS_FLAGS_BYPASS_APP_BANNER_ENGAGEMENT_CHECKS_DESCRIPTION, |
| - kOsAll, |
| + IDS_FLAGS_BYPASS_APP_BANNER_ENGAGEMENT_CHECKS_DESCRIPTION, kOsAll, |
| SINGLE_VALUE_TYPE(switches::kBypassAppBannerEngagementChecks)}, |
| - {"use-sync-sandbox", |
| - IDS_FLAGS_SYNC_SANDBOX_NAME, |
| - IDS_FLAGS_SYNC_SANDBOX_DESCRIPTION, |
| - kOsAll, |
| + {"use-sync-sandbox", IDS_FLAGS_SYNC_SANDBOX_NAME, |
| + IDS_FLAGS_SYNC_SANDBOX_DESCRIPTION, kOsAll, |
| SINGLE_VALUE_TYPE_AND_VALUE( |
| switches::kSyncServiceURL, |
| "https://chrome-sync.sandbox.google.com/chrome-sync/alpha")}, |
| - {"enable-child-account-detection", |
| - IDS_FLAGS_CHILD_ACCOUNT_DETECTION_NAME, |
| + {"enable-child-account-detection", IDS_FLAGS_CHILD_ACCOUNT_DETECTION_NAME, |
| IDS_FLAGS_CHILD_ACCOUNT_DETECTION_DESCRIPTION, |
| kOsAndroid | kOsMac | kOsWin | kOsLinux | kOsCrOS, |
| ENABLE_DISABLE_VALUE_TYPE(switches::kEnableChildAccountDetection, |
| @@ -1771,69 +1460,57 @@ const FeatureEntry kFeatureEntries[] = { |
| #if defined(OS_CHROMEOS) && defined(USE_OZONE) |
| {"ozone-test-single-overlay-support", |
| IDS_FLAGS_OZONE_TEST_SINGLE_HARDWARE_OVERLAY, |
| - IDS_FLAGS_OZONE_TEST_SINGLE_HARDWARE_OVERLAY_DESCRIPTION, |
| - kOsCrOS, |
| + IDS_FLAGS_OZONE_TEST_SINGLE_HARDWARE_OVERLAY_DESCRIPTION, kOsCrOS, |
| SINGLE_VALUE_TYPE(switches::kOzoneTestSingleOverlaySupport)}, |
| #endif // defined(OS_CHROMEOS) && defined(USE_OZONE) |
| - {"v8-pac-mojo-out-of-process", |
| - IDS_FLAGS_V8_PAC_MOJO_OUT_OF_PROCESS_NAME, |
| - IDS_FLAGS_V8_PAC_MOJO_OUT_OF_PROCESS_DESCRIPTION, |
| - kOsDesktop, |
| + {"v8-pac-mojo-out-of-process", IDS_FLAGS_V8_PAC_MOJO_OUT_OF_PROCESS_NAME, |
| + IDS_FLAGS_V8_PAC_MOJO_OUT_OF_PROCESS_DESCRIPTION, kOsDesktop, |
| ENABLE_DISABLE_VALUE_TYPE(switches::kV8PacMojoOutOfProcess, |
| switches::kDisableOutOfProcessPac)}, |
| #if defined(ENABLE_MEDIA_ROUTER) && !defined(OS_ANDROID) |
| - {"media-router", |
| - IDS_FLAGS_MEDIA_ROUTER_NAME, |
| - IDS_FLAGS_MEDIA_ROUTER_DESCRIPTION, |
| - kOsDesktop, |
| - ENABLE_DISABLE_VALUE_TYPE_AND_VALUE( |
| - switches::kMediaRouter, "1", switches::kMediaRouter, "0")}, |
| + {"media-router", IDS_FLAGS_MEDIA_ROUTER_NAME, |
| + IDS_FLAGS_MEDIA_ROUTER_DESCRIPTION, kOsDesktop, |
| + ENABLE_DISABLE_VALUE_TYPE_AND_VALUE(switches::kMediaRouter, |
| + "1", |
| + switches::kMediaRouter, |
| + "0")}, |
| #endif // defined(ENABLE_MEDIA_ROUTER) && !defined(OS_ANDROID) |
| // Since Drive Search is not available when app list is disabled, flag guard |
| // enable-drive-search-in-chrome-launcher flag. |
| #if defined(ENABLE_APP_LIST) |
| {"enable-drive-search-in-app-launcher", |
| IDS_FLAGS_DRIVE_SEARCH_IN_CHROME_LAUNCHER, |
| - IDS_FLAGS_DRIVE_SEARCH_IN_CHROME_LAUNCHER_DESCRIPTION, |
| - kOsCrOS, |
| + IDS_FLAGS_DRIVE_SEARCH_IN_CHROME_LAUNCHER_DESCRIPTION, kOsCrOS, |
| ENABLE_DISABLE_VALUE_TYPE( |
| app_list::switches::kEnableDriveSearchInChromeLauncher, |
| app_list::switches::kDisableDriveSearchInChromeLauncher)}, |
| #endif // defined(ENABLE_APP_LIST) |
| #if defined(OS_CHROMEOS) |
| - {"disable-mtp-write-support", |
| - IDS_FLAGS_MTP_WRITE_SUPPORT_NAME, |
| - IDS_FLAGS_MTP_WRITE_SUPPORT_DESCRIPTION, |
| - kOsCrOS, |
| + {"disable-mtp-write-support", IDS_FLAGS_MTP_WRITE_SUPPORT_NAME, |
| + IDS_FLAGS_MTP_WRITE_SUPPORT_DESCRIPTION, kOsCrOS, |
| SINGLE_DISABLE_VALUE_TYPE(chromeos::switches::kDisableMtpWriteSupport)}, |
| #endif // defined(OS_CHROMEOS) |
| #if defined(OS_CHROMEOS) |
| - {"enable-datasaver-prompt", |
| - IDS_FLAGS_DATASAVER_PROMPT_NAME, |
| - IDS_FLAGS_DATASAVER_PROMPT_DESCRIPTION, |
| - kOsCrOS, |
| + {"enable-datasaver-prompt", IDS_FLAGS_DATASAVER_PROMPT_NAME, |
| + IDS_FLAGS_DATASAVER_PROMPT_DESCRIPTION, kOsCrOS, |
| MULTI_VALUE_TYPE(kDataSaverPromptChoices)}, |
| #endif // defined(OS_CHROMEOS) |
| - {"supervised-user-safesites", |
| - IDS_FLAGS_SUPERVISED_USER_SAFESITES_NAME, |
| + {"supervised-user-safesites", IDS_FLAGS_SUPERVISED_USER_SAFESITES_NAME, |
| IDS_FLAGS_SUPERVISED_USER_SAFESITES_DESCRIPTION, |
| kOsAndroid | kOsMac | kOsWin | kOsLinux | kOsCrOS, |
| MULTI_VALUE_TYPE(kSupervisedUserSafeSitesChoices)}, |
| #if defined(OS_ANDROID) |
| {"enable-autofill-keyboard-accessory-view", |
| IDS_FLAGS_AUTOFILL_ACCESSORY_VIEW_NAME, |
| - IDS_FLAGS_AUTOFILL_ACCESSORY_VIEW_DESCRIPTION, |
| - kOsAndroid, |
| + IDS_FLAGS_AUTOFILL_ACCESSORY_VIEW_DESCRIPTION, kOsAndroid, |
| ENABLE_DISABLE_VALUE_TYPE( |
| autofill::switches::kEnableAccessorySuggestionView, |
| autofill::switches::kDisableAccessorySuggestionView)}, |
| #endif // defined(OS_ANDROID) |
| // Temporary flag to ease the transition to standard-compliant scrollTop |
| // behavior. Will be removed shortly after http://crbug.com/157855 ships. |
| - {"scroll-top-left-interop", |
| - IDS_FLAGS_SCROLL_TOP_LEFT_INTEROP_NAME, |
| - IDS_FLAGS_SCROLL_TOP_LEFT_INTEROP_DESCRIPTION, |
| - kOsAll, |
| + {"scroll-top-left-interop", IDS_FLAGS_SCROLL_TOP_LEFT_INTEROP_NAME, |
| + IDS_FLAGS_SCROLL_TOP_LEFT_INTEROP_DESCRIPTION, kOsAll, |
| ENABLE_DISABLE_VALUE_TYPE_AND_VALUE(switches::kEnableBlinkFeatures, |
| "ScrollTopLeftInterop", |
| switches::kDisableBlinkFeatures, |
| @@ -1841,177 +1518,128 @@ const FeatureEntry kFeatureEntries[] = { |
| #if defined(OS_WIN) |
| {"try-supported-channel-layouts", |
| IDS_FLAGS_TRY_SUPPORTED_CHANNEL_LAYOUTS_NAME, |
| - IDS_FLAGS_TRY_SUPPORTED_CHANNEL_LAYOUTS_DESCRIPTION, |
| - kOsWin, |
| + IDS_FLAGS_TRY_SUPPORTED_CHANNEL_LAYOUTS_DESCRIPTION, kOsWin, |
| SINGLE_VALUE_TYPE(switches::kTrySupportedChannelLayouts)}, |
| #endif |
| {"emphasize-titles-in-omnibox-dropdown", |
| IDS_FLAGS_EMPHASIZE_TITLES_IN_OMNIBOX_DROPDOWN_NAME, |
| - IDS_FLAGS_EMPHASIZE_TITLES_IN_OMNIBOX_DROPDOWN_DESCRIPTION, |
| - kOsAll, |
| + IDS_FLAGS_EMPHASIZE_TITLES_IN_OMNIBOX_DROPDOWN_DESCRIPTION, kOsAll, |
| SINGLE_VALUE_TYPE(switches::kEmphasizeTitlesInOmniboxDropdown)}, |
| #if defined(ENABLE_WEBRTC) |
| - {"enable-webrtc-dtls12", |
| - IDS_FLAGS_WEBRTC_DTLS12_NAME, |
| - IDS_FLAGS_WEBRTC_DTLS12_DESCRIPTION, |
| - kOsAll, |
| + {"enable-webrtc-dtls12", IDS_FLAGS_WEBRTC_DTLS12_NAME, |
| + IDS_FLAGS_WEBRTC_DTLS12_DESCRIPTION, kOsAll, |
| SINGLE_VALUE_TYPE(switches::kEnableWebRtcDtls12)}, |
| #endif |
| #if defined(OS_MACOSX) |
| - {"app-info-dialog", |
| - IDS_FLAGS_APP_INFO_DIALOG_NAME, |
| - IDS_FLAGS_APP_INFO_DIALOG_DESCRIPTION, |
| - kOsMac, |
| + {"app-info-dialog", IDS_FLAGS_APP_INFO_DIALOG_NAME, |
| + IDS_FLAGS_APP_INFO_DIALOG_DESCRIPTION, kOsMac, |
| ENABLE_DISABLE_VALUE_TYPE(switches::kEnableAppInfoDialogMac, |
| switches::kDisableAppInfoDialogMac)}, |
| {"mac-views-native-app-windows", |
| IDS_FLAGS_MAC_VIEWS_NATIVE_APP_WINDOWS_NAME, |
| - IDS_FLAGS_MAC_VIEWS_NATIVE_APP_WINDOWS_DESCRIPTION, |
| - kOsMac, |
| + IDS_FLAGS_MAC_VIEWS_NATIVE_APP_WINDOWS_DESCRIPTION, kOsMac, |
| ENABLE_DISABLE_VALUE_TYPE(switches::kEnableMacViewsNativeAppWindows, |
| switches::kDisableMacViewsNativeAppWindows)}, |
| - {"app-window-cycling", |
| - IDS_FLAGS_APP_WINDOW_CYCLING_NAME, |
| - IDS_FLAGS_APP_WINDOW_CYCLING_DESCRIPTION, |
| - kOsMac, |
| + {"app-window-cycling", IDS_FLAGS_APP_WINDOW_CYCLING_NAME, |
| + IDS_FLAGS_APP_WINDOW_CYCLING_DESCRIPTION, kOsMac, |
| ENABLE_DISABLE_VALUE_TYPE(switches::kEnableAppWindowCycling, |
| switches::kDisableAppWindowCycling)}, |
| - {"mac-views-dialogs", |
| - IDS_FLAGS_MAC_VIEWS_DIALOGS_NAME, |
| - IDS_FLAGS_MAC_VIEWS_DIALOGS_DESCRIPTION, |
| - kOsMac, |
| + {"mac-views-dialogs", IDS_FLAGS_MAC_VIEWS_DIALOGS_NAME, |
| + IDS_FLAGS_MAC_VIEWS_DIALOGS_DESCRIPTION, kOsMac, |
| SINGLE_VALUE_TYPE(switches::kEnableMacViewsDialogs)}, |
| #endif |
| #if defined(ENABLE_WEBVR) |
| - {"enable-webvr", |
| - IDS_FLAGS_WEBVR_NAME, |
| - IDS_FLAGS_WEBVR_DESCRIPTION, |
| - kOsAll, |
| + {"enable-webvr", IDS_FLAGS_WEBVR_NAME, IDS_FLAGS_WEBVR_DESCRIPTION, kOsAll, |
| SINGLE_VALUE_TYPE(switches::kEnableWebVR)}, |
| #endif |
| #if defined(OS_CHROMEOS) |
| {"disable-accelerated-mjpeg-decode", |
| IDS_FLAGS_ACCELERATED_MJPEG_DECODE_NAME, |
| - IDS_FLAGS_ACCELERATED_MJPEG_DECODE_DESCRIPTION, |
| - kOsCrOS, |
| + IDS_FLAGS_ACCELERATED_MJPEG_DECODE_DESCRIPTION, kOsCrOS, |
| SINGLE_DISABLE_VALUE_TYPE(switches::kDisableAcceleratedMjpegDecode)}, |
| #endif // OS_CHROMEOS |
| - {"v8-cache-options", |
| - IDS_FLAGS_V8_CACHE_OPTIONS_NAME, |
| - IDS_FLAGS_V8_CACHE_OPTIONS_DESCRIPTION, |
| - kOsAll, |
| + {"v8-cache-options", IDS_FLAGS_V8_CACHE_OPTIONS_NAME, |
| + IDS_FLAGS_V8_CACHE_OPTIONS_DESCRIPTION, kOsAll, |
| MULTI_VALUE_TYPE(kV8CacheOptionsChoices)}, |
| #if !defined(OS_ANDROID) && !defined(OS_IOS) |
| - {"enable-md-downloads", |
| - IDS_FLAGS_ENABLE_MATERIAL_DESIGN_DOWNLOADS_NAME, |
| - IDS_FLAGS_ENABLE_MATERIAL_DESIGN_DOWNLOADS_DESCRIPTION, |
| - kOsDesktop, |
| + {"enable-md-downloads", IDS_FLAGS_ENABLE_MATERIAL_DESIGN_DOWNLOADS_NAME, |
| + IDS_FLAGS_ENABLE_MATERIAL_DESIGN_DOWNLOADS_DESCRIPTION, kOsDesktop, |
| ENABLE_DISABLE_VALUE_TYPE(switches::kEnableMaterialDesignDownloads, |
| switches::kDisableMaterialDesignDownloads)}, |
| #endif |
| {"enable-clear-browsing-data-counters", |
| IDS_FLAGS_ENABLE_CLEAR_BROWSING_DATA_COUNTERS_NAME, |
| - IDS_FLAGS_ENABLE_CLEAR_BROWSING_DATA_COUNTERS_DESCRIPTION, |
| - kOsAll, |
| + IDS_FLAGS_ENABLE_CLEAR_BROWSING_DATA_COUNTERS_DESCRIPTION, kOsAll, |
| ENABLE_DISABLE_VALUE_TYPE(switches::kEnableClearBrowsingDataCounters, |
| - switches::kDisableClearBrowsingDataCounters) |
| - }, |
| + switches::kDisableClearBrowsingDataCounters)}, |
| #if defined(ENABLE_TASK_MANAGER) |
| - {"disable-new-task-manager", |
| - IDS_FLAGS_NEW_TASK_MANAGER_NAME, |
| - IDS_FLAGS_NEW_TASK_MANAGER_DESCRIPTION, |
| - kOsDesktop, |
| - SINGLE_DISABLE_VALUE_TYPE(switches::kDisableNewTaskManager) |
| - }, |
| + {"disable-new-task-manager", IDS_FLAGS_NEW_TASK_MANAGER_NAME, |
| + IDS_FLAGS_NEW_TASK_MANAGER_DESCRIPTION, kOsDesktop, |
| + SINGLE_DISABLE_VALUE_TYPE(switches::kDisableNewTaskManager)}, |
| #endif // defined(ENABLE_TASK_MANAGER) |
| - {"simplified-fullscreen-ui", |
| - IDS_FLAGS_SIMPLIFIED_FULLSCREEN_UI_NAME, |
| - IDS_FLAGS_SIMPLIFIED_FULLSCREEN_UI_DESCRIPTION, |
| - kOsDesktop, |
| + {"simplified-fullscreen-ui", IDS_FLAGS_SIMPLIFIED_FULLSCREEN_UI_NAME, |
| + IDS_FLAGS_SIMPLIFIED_FULLSCREEN_UI_DESCRIPTION, kOsDesktop, |
| ENABLE_DISABLE_VALUE_TYPE(switches::kEnableSimplifiedFullscreenUI, |
| - switches::kDisableSimplifiedFullscreenUI) |
| - }, |
| + switches::kDisableSimplifiedFullscreenUI)}, |
| #if defined(OS_ANDROID) |
| - {"progress-bar-animation", |
| - IDS_FLAGS_PROGRESS_BAR_ANIMATION_NAME, |
| - IDS_FLAGS_PROGRESS_BAR_ANIMATION_DESCRIPTION, |
| - kOsAndroid, |
| + {"progress-bar-animation", IDS_FLAGS_PROGRESS_BAR_ANIMATION_NAME, |
| + IDS_FLAGS_PROGRESS_BAR_ANIMATION_DESCRIPTION, kOsAndroid, |
| MULTI_VALUE_TYPE(kProgressBarAnimationChoices)}, |
| #endif // defined(OS_ANDROID) |
| #if defined(OS_ANDROID) |
| - {"offline-pages", |
| - IDS_FLAGS_OFFLINE_PAGES_NAME, |
| - IDS_FLAGS_OFFLINE_PAGES_DESCRIPTION, |
| - kOsAndroid, |
| + {"offline-pages", IDS_FLAGS_OFFLINE_PAGES_NAME, |
| + IDS_FLAGS_OFFLINE_PAGES_DESCRIPTION, kOsAndroid, |
| ENABLE_DISABLE_VALUE_TYPE(switches::kEnableOfflinePages, |
| switches::kDisableOfflinePages)}, |
| #endif // defined(OS_ANDROID) |
| - {"low-priority-iframes", |
| - IDS_FLAGS_LOW_PRIORITY_IFRAMES_UI_NAME, |
| - IDS_FLAGS_LOW_PRIORITY_IFRAMES_UI_DESCRIPTION, |
| - kOsAll, |
| + {"low-priority-iframes", IDS_FLAGS_LOW_PRIORITY_IFRAMES_UI_NAME, |
| + IDS_FLAGS_LOW_PRIORITY_IFRAMES_UI_DESCRIPTION, kOsAll, |
| // NOTE: if we want to add additional experiment entries for other |
| // features controlled by kBlinkSettings, we'll need to add logic to |
| // merge the flag values. |
| - SINGLE_VALUE_TYPE_AND_VALUE( |
| - switches::kBlinkSettings, "lowPriorityIframes=true")}, |
| + SINGLE_VALUE_TYPE_AND_VALUE(switches::kBlinkSettings, |
| + "lowPriorityIframes=true")}, |
| #if defined(OS_ANDROID) |
| - {"enable-ntp-popular-sites", |
| - IDS_FLAGS_NTP_POPULAR_SITES_NAME, |
| - IDS_FLAGS_NTP_POPULAR_SITES_DESCRIPTION, |
| - kOsAndroid, |
| + {"enable-ntp-popular-sites", IDS_FLAGS_NTP_POPULAR_SITES_NAME, |
| + IDS_FLAGS_NTP_POPULAR_SITES_DESCRIPTION, kOsAndroid, |
| ENABLE_DISABLE_VALUE_TYPE(switches::kEnableNTPPopularSites, |
| switches::kDisableNTPPopularSites)}, |
| - {"ntp-switch-to-existing-tab", |
| - IDS_FLAGS_NTP_SWITCH_TO_EXISTING_TAB_NAME, |
| - IDS_FLAGS_NTP_SWITCH_TO_EXISTING_TAB_DESCRIPTION, |
| - kOsAndroid, |
| + {"ntp-switch-to-existing-tab", IDS_FLAGS_NTP_SWITCH_TO_EXISTING_TAB_NAME, |
| + IDS_FLAGS_NTP_SWITCH_TO_EXISTING_TAB_DESCRIPTION, kOsAndroid, |
| MULTI_VALUE_TYPE(kNtpSwitchToExistingTabChoices)}, |
| - {"use-android-midi-api", |
| - IDS_FLAGS_USE_ANDROID_MIDI_API_NAME, |
| - IDS_FLAGS_USE_ANDROID_MIDI_API_DESCRIPTION, |
| - kOsAndroid, |
| + {"use-android-midi-api", IDS_FLAGS_USE_ANDROID_MIDI_API_NAME, |
| + IDS_FLAGS_USE_ANDROID_MIDI_API_DESCRIPTION, kOsAndroid, |
| SINGLE_VALUE_TYPE(switches::kUseAndroidMidiApi)}, |
| #endif // defined(OS_ANDROID) |
| #if defined(OS_WIN) |
| - {"trace-export-events-to-etw", |
| - IDS_FLAGS_TRACE_EXPORT_EVENTS_TO_ETW_NAME, |
| - IDS_FLAGS_TRACE_EXPORT_EVENTS_TO_ETW_DESRIPTION, |
| - kOsWin, |
| - SINGLE_VALUE_TYPE(switches::kTraceExportEventsToETW)}, |
| - {"merge-key-char-events", |
| - IDS_FLAGS_MERGE_KEY_CHAR_EVENTS_NAME, |
| - IDS_FLAGS_MERGE_KEY_CHAR_EVENTS_DESCRIPTION, |
| - kOsWin, |
| + {"trace-export-events-to-etw", IDS_FLAGS_TRACE_EXPORT_EVENTS_TO_ETW_NAME, |
| + IDS_FLAGS_TRACE_EXPORT_EVENTS_TO_ETW_DESRIPTION, kOsWin, |
| + SINGLE_VALUE_TYPE(switches::kTraceExportEventsToETW)}, |
| + {"merge-key-char-events", IDS_FLAGS_MERGE_KEY_CHAR_EVENTS_NAME, |
| + IDS_FLAGS_MERGE_KEY_CHAR_EVENTS_DESCRIPTION, kOsWin, |
| ENABLE_DISABLE_VALUE_TYPE(switches::kEnableMergeKeyCharEvents, |
| switches::kDisableMergeKeyCharEvents)}, |
| #endif // defined(OS_WIN) |
| #if defined(ENABLE_BACKGROUND) |
| - {"enable-push-api-background-mode", |
| - IDS_FLAGS_PUSH_API_BACKGROUND_MODE_NAME, |
| - IDS_FLAGS_PUSH_API_BACKGROUND_MODE_DESCRIPTION, |
| - kOsMac | kOsWin | kOsLinux, |
| + {"enable-push-api-background-mode", IDS_FLAGS_PUSH_API_BACKGROUND_MODE_NAME, |
| + IDS_FLAGS_PUSH_API_BACKGROUND_MODE_DESCRIPTION, kOsMac | kOsWin | kOsLinux, |
| ENABLE_DISABLE_VALUE_TYPE(switches::kEnablePushApiBackgroundMode, |
| switches::kDisablePushApiBackgroundMode)}, |
| #endif // defined(ENABLE_BACKGROUND) |
| #if defined(OS_CHROMEOS) |
| - {"cros-regions-mode", |
| - IDS_FLAGS_CROS_REGIONS_MODE_NAME, |
| - IDS_FLAGS_CROS_REGIONS_MODE_DESCRIPTION, |
| - kOsCrOS, |
| + {"cros-regions-mode", IDS_FLAGS_CROS_REGIONS_MODE_NAME, |
| + IDS_FLAGS_CROS_REGIONS_MODE_DESCRIPTION, kOsCrOS, |
| MULTI_VALUE_TYPE(kCrosRegionsModeChoices)}, |
| #endif // OS_CHROMEOS |
| #if defined(OS_WIN) |
| - {"enable-ppapi-win32k-lockdown", |
| - IDS_FLAGS_PPAPI_WIN32K_LOCKDOWN_NAME, |
| + {"enable-ppapi-win32k-lockdown", IDS_FLAGS_PPAPI_WIN32K_LOCKDOWN_NAME, |
| IDS_FLAGS_PPAPI_WIN32K_LOCKDOWN_DESCRIPTION, kOsWin, |
| MULTI_VALUE_TYPE(kPpapiWin32kLockdown)}, |
| #endif // defined(OS_WIN) |
| #if defined(ENABLE_NOTIFICATIONS) && defined(OS_ANDROID) |
| {"enable-web-notification-custom-layouts", |
| IDS_FLAGS_ENABLE_WEB_NOTIFICATION_CUSTOM_LAYOUTS_NAME, |
| - IDS_FLAGS_ENABLE_WEB_NOTIFICATION_CUSTOM_LAYOUTS_DESCRIPTION, |
| - kOsAndroid, |
| + IDS_FLAGS_ENABLE_WEB_NOTIFICATION_CUSTOM_LAYOUTS_DESCRIPTION, kOsAndroid, |
| ENABLE_DISABLE_VALUE_TYPE(switches::kEnableWebNotificationCustomLayouts, |
| switches::kDisableWebNotificationCustomLayouts)}, |
| #endif // defined(ENABLE_NOTIFICATIONS) && defined(OS_ANDROID) |
| @@ -2024,8 +1652,7 @@ const FeatureEntry kFeatureEntries[] = { |
| #if defined(OS_ANDROID) |
| {"disable-auto-hiding-toolbar-threshold", |
| IDS_FLAGS_DISABLE_AUTO_HIDING_TOOLBAR_NAME, |
| - IDS_FLAGS_DISABLE_AUTO_HIDING_TOOLBAR_DESCRIPTION, |
| - kOsAndroid, |
| + IDS_FLAGS_DISABLE_AUTO_HIDING_TOOLBAR_DESCRIPTION, kOsAndroid, |
| SINGLE_VALUE_TYPE_AND_VALUE(switches::kDisableAutoHidingToolbarThreshold, |
| "800")}, |
| #endif |
| @@ -2044,41 +1671,32 @@ const FeatureEntry kFeatureEntries[] = { |
| IDS_FLAGS_TAB_SWITCHER_IN_DOCUMENT_MODE_DESCRIPTION, kOsAndroid, |
| SINGLE_VALUE_TYPE(switches::kEnableTabSwitcherInDocumentMode)}, |
| #endif // OS_ANDROID |
| - {"enable-md-history", |
| - IDS_FLAGS_ENABLE_MATERIAL_DESIGN_HISTORY_NAME, |
| - IDS_FLAGS_ENABLE_MATERIAL_DESIGN_HISTORY_DESCRIPTION, |
| - kOsDesktop | kOsAndroid, |
| - SINGLE_VALUE_TYPE(switches::kEnableMaterialDesignHistory)}, |
| + {"enable-md-history", IDS_FLAGS_ENABLE_MATERIAL_DESIGN_HISTORY_NAME, |
| + IDS_FLAGS_ENABLE_MATERIAL_DESIGN_HISTORY_DESCRIPTION, |
| + kOsDesktop | kOsAndroid, |
| + SINGLE_VALUE_TYPE(switches::kEnableMaterialDesignHistory)}, |
| #if defined(OS_WIN) |
| {"enable-windows-desktop-search-redirection", |
| IDS_FLAGS_WINDOWS_DESKTOP_SEARCH_REDIRECTION_NAME, |
| - IDS_FLAGS_WINDOWS_DESKTOP_SEARCH_REDIRECTION_DESCRIPTION, |
| - kOsWin, |
| + IDS_FLAGS_WINDOWS_DESKTOP_SEARCH_REDIRECTION_DESCRIPTION, kOsWin, |
| FEATURE_VALUE_TYPE(kWindowsDesktopSearchRedirectionFeature)}, |
| #endif // defined(OS_WIN) |
| - {"force-ui-direction", |
| - IDS_FLAGS_FORCE_UI_DIRECTION_NAME, |
| - IDS_FLAGS_FORCE_UI_DIRECTION_DESCRIPTION, |
| - kOsAll, |
| + {"force-ui-direction", IDS_FLAGS_FORCE_UI_DIRECTION_NAME, |
| + IDS_FLAGS_FORCE_UI_DIRECTION_DESCRIPTION, kOsAll, |
| MULTI_VALUE_TYPE(kForceUIDirectionChoices)}, |
| #if defined(ENABLE_EXTENSIONS) |
| - {"enable-md-extensions", |
| - IDS_FLAGS_ENABLE_MATERIAL_DESIGN_EXTENSIONS_NAME, |
| - IDS_FLAGS_ENABLE_MATERIAL_DESIGN_EXTENSIONS_DESCRIPTION, |
| - kOsDesktop, |
| - SINGLE_VALUE_TYPE(switches::kEnableMaterialDesignExtensions)}, |
| + {"enable-md-extensions", IDS_FLAGS_ENABLE_MATERIAL_DESIGN_EXTENSIONS_NAME, |
| + IDS_FLAGS_ENABLE_MATERIAL_DESIGN_EXTENSIONS_DESCRIPTION, kOsDesktop, |
| + SINGLE_VALUE_TYPE(switches::kEnableMaterialDesignExtensions)}, |
| #endif |
| #if defined(OS_WIN) || defined(OS_LINUX) |
| - {"enable-input-ime-api", IDS_FLAGS_ENABLE_INPUT_IME_API_NAME, |
| - IDS_FLAGS_ENABLE_INPUT_IME_API_DESCRIPTION, |
| - kOsWin | kOsLinux, |
| - ENABLE_DISABLE_VALUE_TYPE(switches::kEnableInputImeAPI, |
| - switches::kDisableInputImeAPI)}, |
| + {"enable-input-ime-api", IDS_FLAGS_ENABLE_INPUT_IME_API_NAME, |
| + IDS_FLAGS_ENABLE_INPUT_IME_API_DESCRIPTION, kOsWin | kOsLinux, |
| + ENABLE_DISABLE_VALUE_TYPE(switches::kEnableInputImeAPI, |
| + switches::kDisableInputImeAPI)}, |
| #endif // defined(OS_WIN) || defined(OS_LINUX) |
| - {"enable-experimental-framework", |
| - IDS_FLAGS_EXPERIMENTAL_FRAMEWORK_NAME, |
| - IDS_FLAGS_EXPERIMENTAL_FRAMEWORK_DESCRIPTION, |
| - kOsAll, |
| + {"enable-experimental-framework", IDS_FLAGS_EXPERIMENTAL_FRAMEWORK_NAME, |
| + IDS_FLAGS_EXPERIMENTAL_FRAMEWORK_DESCRIPTION, kOsAll, |
| FEATURE_VALUE_TYPE(features::kExperimentalFramework)}, |
| #if defined(OS_ANDROID) |
| {"enable-unified-media-pipeline", |
| @@ -2086,8 +1704,8 @@ const FeatureEntry kFeatureEntries[] = { |
| IDS_FLAGS_ENABLE_UNIFIED_MEDIA_PIPELINE_DESCRIPTION, kOsAndroid, |
| SINGLE_VALUE_TYPE(switches::kEnableUnifiedMediaPipeline)}, |
| #endif // OS_ANDROID |
| - // NOTE: Adding new command-line switches requires adding corresponding |
| - // entries to enum "LoginCustomFlags" in histograms.xml. See note in |
| + // NOTE: Adding new command-line switches requires adding corresponding |
| + // entries to enum "LoginCustomFlags" in histograms.xml. See note in |
| // histograms.xml and don't forget to run AboutFlagsHistogramTest unit test. |
| }; |