Chromium Code Reviews Chromium Code Reviews
Issue 813873005:
Add field trial and flag to mark HTTP as non-secure. (Closed)
Base URL: https://chromium.googlesource.com/chromium/src.git@master| Index: chrome/browser/about_flags.cc |
| diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc |
| index 8e458b719f1bc853d8aaa4c740d60b090e49b7a8..e98a55c4e495a2085e16537812d7e0514b1b6d70 100644 |
| --- a/chrome/browser/about_flags.cc |
| +++ b/chrome/browser/about_flags.cc |
| @@ -188,6 +188,17 @@ const Experiment::Choice kNaClDebugMaskChoices[] = { |
| }; |
| #endif |
| +const Experiment::Choice kMarkHttpAsNonSecureChoices[] = { |
|
jww
2014/12/20 01:21:57
I know, I know, it sucks that this file isn't form
palmer
2014/12/20 01:59:53
Done.
|
| + {IDS_MARK_HTTP_AS_NON_SECURE_CHOICE_NO, |
| + switches::kMarkHttpAsNonSecure, |
| + "no"}, |
| + {IDS_MARK_HTTP_AS_NON_SECURE_CHOICE_NON_SECURE, |
| + switches::kMarkHttpAsNonSecure, |
| + "non-secure"}, |
| + {IDS_MARK_HTTP_AS_NON_SECURE_CHOICE_DUBIOUS, |
| + switches::kMarkHttpAsNonSecure, |
| + "dubious"}}; |
| + |
| const Experiment::Choice kMaxTilesForInterestAreaChoices[] = { |
| { IDS_GENERIC_EXPERIMENT_CHOICE_DEFAULT, "", "" }, |
| { IDS_FLAGS_MAX_TILES_FOR_INTEREST_AREA_SHORT, |
| @@ -423,1674 +434,1295 @@ const Experiment::Choice kSSLVersionMinChoices[] = { |
| // |
| // When adding a new choice, add it to the end of the list. |
| const Experiment kExperiments[] = { |
| - { |
| - "ignore-gpu-blacklist", |
| - IDS_FLAGS_IGNORE_GPU_BLACKLIST_NAME, |
| - IDS_FLAGS_IGNORE_GPU_BLACKLIST_DESCRIPTION, |
| - kOsAll, |
| - SINGLE_VALUE_TYPE(switches::kIgnoreGpuBlacklist) |
| - }, |
| + {"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_DISABLE_DIRECT_WRITE_NAME, |
| - IDS_FLAGS_DISABLE_DIRECT_WRITE_DESCRIPTION, |
| - kOsWin, |
| - SINGLE_VALUE_TYPE(switches::kDisableDirectWrite) |
| - }, |
| - { |
| - "enable-win32k-renderer-lockdown", |
| - IDS_FLAGS_ENABLE_WIN32K_RENDERER_LOCKDOWN_NAME, |
| - IDS_FLAGS_ENABLE_WIN32K_RENDERER_LOCKDOWN_DESCRIPTION, |
| - kOsWin, |
| - ENABLE_DISABLE_VALUE_TYPE(switches::kEnableWin32kRendererLockDown, |
| - switches::kDisableWin32kRendererLockDown) |
| - }, |
| -#endif |
| - { |
| - "enable-experimental-canvas-features", |
| - IDS_FLAGS_ENABLE_EXPERIMENTAL_CANVAS_FEATURES_NAME, |
| - IDS_FLAGS_ENABLE_EXPERIMENTAL_CANVAS_FEATURES_DESCRIPTION, |
| - kOsAll, |
| - SINGLE_VALUE_TYPE(switches::kEnableExperimentalCanvasFeatures) |
| - }, |
| - { |
| - "disable-accelerated-2d-canvas", |
| - IDS_FLAGS_DISABLE_ACCELERATED_2D_CANVAS_NAME, |
| - IDS_FLAGS_DISABLE_ACCELERATED_2D_CANVAS_DESCRIPTION, |
| - kOsAll, |
| - SINGLE_VALUE_TYPE(switches::kDisableAccelerated2dCanvas) |
| - }, |
| - { |
| - "enable-display-list-2d-canvas", |
| - IDS_FLAGS_ENABLE_DISPLAY_LIST_2D_CANVAS_NAME, |
| - IDS_FLAGS_ENABLE_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, |
| - SINGLE_VALUE_TYPE(cc::switches::kShowCompositedLayerBorders) |
| - }, |
| - { |
| - "show-fps-counter", |
| - IDS_FLAGS_SHOW_FPS_COUNTER, |
| - IDS_FLAGS_SHOW_FPS_COUNTER_DESCRIPTION, |
| - kOsAll, |
| - SINGLE_VALUE_TYPE(cc::switches::kShowFPSCounter) |
| - }, |
| - { |
| - "disable-webgl", |
| - IDS_FLAGS_DISABLE_WEBGL_NAME, |
| - IDS_FLAGS_DISABLE_WEBGL_DESCRIPTION, |
| - kOsAll, |
| - SINGLE_VALUE_TYPE(switches::kDisableExperimentalWebGL) |
| - }, |
| - { |
| - "disable-webrtc", |
| - IDS_FLAGS_DISABLE_WEBRTC_NAME, |
| - IDS_FLAGS_DISABLE_WEBRTC_DESCRIPTION, |
| - kOsAndroid, |
| + {"disable-direct-write", |
| + IDS_FLAGS_DISABLE_DIRECT_WRITE_NAME, |
| + IDS_FLAGS_DISABLE_DIRECT_WRITE_DESCRIPTION, |
| + kOsWin, |
| + SINGLE_VALUE_TYPE(switches::kDisableDirectWrite)}, |
| + {"enable-win32k-renderer-lockdown", |
| + IDS_FLAGS_ENABLE_WIN32K_RENDERER_LOCKDOWN_NAME, |
| + IDS_FLAGS_ENABLE_WIN32K_RENDERER_LOCKDOWN_DESCRIPTION, |
| + kOsWin, |
| + ENABLE_DISABLE_VALUE_TYPE(switches::kEnableWin32kRendererLockDown, |
| + switches::kDisableWin32kRendererLockDown)}, |
| +#endif |
| + {"enable-experimental-canvas-features", |
| + IDS_FLAGS_ENABLE_EXPERIMENTAL_CANVAS_FEATURES_NAME, |
| + IDS_FLAGS_ENABLE_EXPERIMENTAL_CANVAS_FEATURES_DESCRIPTION, |
| + kOsAll, |
| + SINGLE_VALUE_TYPE(switches::kEnableExperimentalCanvasFeatures)}, |
| + {"disable-accelerated-2d-canvas", |
| + IDS_FLAGS_DISABLE_ACCELERATED_2D_CANVAS_NAME, |
| + IDS_FLAGS_DISABLE_ACCELERATED_2D_CANVAS_DESCRIPTION, |
| + kOsAll, |
| + SINGLE_VALUE_TYPE(switches::kDisableAccelerated2dCanvas)}, |
| + {"enable-display-list-2d-canvas", |
| + IDS_FLAGS_ENABLE_DISPLAY_LIST_2D_CANVAS_NAME, |
| + IDS_FLAGS_ENABLE_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, |
| + SINGLE_VALUE_TYPE(cc::switches::kShowCompositedLayerBorders)}, |
| + {"show-fps-counter", |
| + IDS_FLAGS_SHOW_FPS_COUNTER, |
| + IDS_FLAGS_SHOW_FPS_COUNTER_DESCRIPTION, |
| + kOsAll, |
| + SINGLE_VALUE_TYPE(cc::switches::kShowFPSCounter)}, |
| + {"disable-webgl", |
| + IDS_FLAGS_DISABLE_WEBGL_NAME, |
| + IDS_FLAGS_DISABLE_WEBGL_DESCRIPTION, |
| + kOsAll, |
| + SINGLE_VALUE_TYPE(switches::kDisableExperimentalWebGL)}, |
| + {"disable-webrtc", |
| + IDS_FLAGS_DISABLE_WEBRTC_NAME, |
| + IDS_FLAGS_DISABLE_WEBRTC_DESCRIPTION, |
| + kOsAndroid, |
| #if defined(OS_ANDROID) |
| - SINGLE_VALUE_TYPE(switches::kDisableWebRTC) |
| + SINGLE_VALUE_TYPE(switches::kDisableWebRTC) |
| #else |
| - SINGLE_VALUE_TYPE("") |
| + SINGLE_VALUE_TYPE("") |
| #endif |
| - }, |
| + }, |
| #if defined(ENABLE_WEBRTC) |
| - { |
| - "disable-webrtc-hw-decoding", |
| - IDS_FLAGS_DISABLE_WEBRTC_HW_DECODING_NAME, |
| - IDS_FLAGS_DISABLE_WEBRTC_HW_DECODING_DESCRIPTION, |
| - kOsAndroid | kOsCrOS, |
| - SINGLE_VALUE_TYPE(switches::kDisableWebRtcHWDecoding) |
| - }, |
| - { |
| - "disable-webrtc-hw-encoding", |
| - IDS_FLAGS_DISABLE_WEBRTC_HW_ENCODING_NAME, |
| - IDS_FLAGS_DISABLE_WEBRTC_HW_ENCODING_DESCRIPTION, |
| - kOsAndroid | kOsCrOS, |
| - SINGLE_VALUE_TYPE(switches::kDisableWebRtcHWEncoding) |
| - }, |
| + {"disable-webrtc-hw-decoding", |
| + IDS_FLAGS_DISABLE_WEBRTC_HW_DECODING_NAME, |
| + IDS_FLAGS_DISABLE_WEBRTC_HW_DECODING_DESCRIPTION, |
| + kOsAndroid | kOsCrOS, |
| + SINGLE_VALUE_TYPE(switches::kDisableWebRtcHWDecoding)}, |
| + {"disable-webrtc-hw-encoding", |
| + IDS_FLAGS_DISABLE_WEBRTC_HW_ENCODING_NAME, |
| + IDS_FLAGS_DISABLE_WEBRTC_HW_ENCODING_DESCRIPTION, |
| + kOsAndroid | kOsCrOS, |
| + SINGLE_VALUE_TYPE(switches::kDisableWebRtcHWEncoding)}, |
| #endif |
| #if defined(OS_ANDROID) |
| - { |
| - "disable-webaudio", |
| - IDS_FLAGS_DISABLE_WEBAUDIO_NAME, |
| - IDS_FLAGS_DISABLE_WEBAUDIO_DESCRIPTION, |
| - kOsAndroid, |
| - SINGLE_VALUE_TYPE(switches::kDisableWebAudio) |
| - }, |
| + {"disable-webaudio", |
| + IDS_FLAGS_DISABLE_WEBAUDIO_NAME, |
| + IDS_FLAGS_DISABLE_WEBAUDIO_DESCRIPTION, |
| + kOsAndroid, |
| + SINGLE_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_ENABLE_NACL_NAME, |
| - IDS_FLAGS_ENABLE_NACL_DESCRIPTION, |
| - kOsAll, |
| - SINGLE_VALUE_TYPE(switches::kEnableNaCl) |
| - }, |
| - { |
| - "enable-nacl-debug", // FLAGS:RECORD_UMA |
| - IDS_FLAGS_ENABLE_NACL_DEBUG_NAME, |
| - IDS_FLAGS_ENABLE_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) |
| - }, |
| + {"enable-nacl", // FLAGS:RECORD_UMA |
| + IDS_FLAGS_ENABLE_NACL_NAME, |
| + IDS_FLAGS_ENABLE_NACL_DESCRIPTION, |
| + kOsAll, |
| + SINGLE_VALUE_TYPE(switches::kEnableNaCl)}, |
| + {"enable-nacl-debug", // FLAGS:RECORD_UMA |
| + IDS_FLAGS_ENABLE_NACL_DEBUG_NAME, |
| + IDS_FLAGS_ENABLE_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)}, |
| #endif |
| #if defined(ENABLE_EXTENSIONS) |
| - { |
| - "extension-apis", // FLAGS:RECORD_UMA |
| - IDS_FLAGS_EXPERIMENTAL_EXTENSION_APIS_NAME, |
| - 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, |
| - SINGLE_VALUE_TYPE(extensions::switches::kExtensionsOnChromeURLs) |
| - }, |
| -#endif |
| - { |
| - "enable-fast-unload", |
| - IDS_FLAGS_ENABLE_FAST_UNLOAD_NAME, |
| - IDS_FLAGS_ENABLE_FAST_UNLOAD_DESCRIPTION, |
| - kOsAll, |
| - SINGLE_VALUE_TYPE(switches::kEnableFastUnload) |
| - }, |
| + {"extension-apis", // FLAGS:RECORD_UMA |
| + IDS_FLAGS_EXPERIMENTAL_EXTENSION_APIS_NAME, |
| + 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, |
| + SINGLE_VALUE_TYPE(extensions::switches::kExtensionsOnChromeURLs)}, |
| +#endif |
| + {"enable-fast-unload", |
| + IDS_FLAGS_ENABLE_FAST_UNLOAD_NAME, |
| + IDS_FLAGS_ENABLE_FAST_UNLOAD_DESCRIPTION, |
| + kOsAll, |
| + SINGLE_VALUE_TYPE(switches::kEnableFastUnload)}, |
| #if defined(ENABLE_EXTENSIONS) |
| - { |
| - "enable-app-window-controls", |
| - IDS_FLAGS_ENABLE_APP_WINDOW_CONTROLS_NAME, |
| - IDS_FLAGS_ENABLE_APP_WINDOW_CONTROLS_DESCRIPTION, |
| - kOsDesktop, |
| - SINGLE_VALUE_TYPE(extensions::switches::kEnableAppWindowControls) |
| - }, |
| -#endif |
| - { |
| - "disable-hyperlink-auditing", |
| - IDS_FLAGS_DISABLE_HYPERLINK_AUDITING_NAME, |
| - IDS_FLAGS_DISABLE_HYPERLINK_AUDITING_DESCRIPTION, |
| - kOsAll, |
| - SINGLE_VALUE_TYPE(switches::kNoPings) |
| - }, |
| + {"enable-app-window-controls", |
| + IDS_FLAGS_ENABLE_APP_WINDOW_CONTROLS_NAME, |
| + IDS_FLAGS_ENABLE_APP_WINDOW_CONTROLS_DESCRIPTION, |
| + kOsDesktop, |
| + SINGLE_VALUE_TYPE(extensions::switches::kEnableAppWindowControls)}, |
| +#endif |
| + {"disable-hyperlink-auditing", |
| + IDS_FLAGS_DISABLE_HYPERLINK_AUDITING_NAME, |
| + IDS_FLAGS_DISABLE_HYPERLINK_AUDITING_DESCRIPTION, |
| + kOsAll, |
| + SINGLE_VALUE_TYPE(switches::kNoPings)}, |
| #if defined(OS_ANDROID) |
| - { |
| - "contextual-search", |
| - IDS_FLAGS_ENABLE_CONTEXTUAL_SEARCH, |
| - IDS_FLAGS_ENABLE_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, |
| - SINGLE_VALUE_TYPE(autofill::switches::kShowAutofillTypePredictions) |
| - }, |
| - { |
| - "enable-smooth-scrolling", // FLAGS:RECORD_UMA |
| - IDS_FLAGS_ENABLE_SMOOTH_SCROLLING_NAME, |
| - IDS_FLAGS_ENABLE_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, |
| - SINGLE_VALUE_TYPE(switches::kEnableSmoothScrolling) |
| - }, |
| + {"contextual-search", |
| + IDS_FLAGS_ENABLE_CONTEXTUAL_SEARCH, |
| + IDS_FLAGS_ENABLE_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, |
| + SINGLE_VALUE_TYPE(autofill::switches::kShowAutofillTypePredictions)}, |
| + {"enable-smooth-scrolling", // FLAGS:RECORD_UMA |
| + IDS_FLAGS_ENABLE_SMOOTH_SCROLLING_NAME, |
| + IDS_FLAGS_ENABLE_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, |
| + SINGLE_VALUE_TYPE(switches::kEnableSmoothScrolling)}, |
| #if defined(USE_AURA) || defined(OS_LINUX) |
| - { |
| - "overlay-scrollbars", |
| - IDS_FLAGS_ENABLE_OVERLAY_SCROLLBARS_NAME, |
| - IDS_FLAGS_ENABLE_OVERLAY_SCROLLBARS_DESCRIPTION, |
| - // Uses the system preference on Mac (a different implementation). |
| - // On Android, this is always enabled. |
| - kOsLinux | kOsCrOS | kOsWin, |
| - ENABLE_DISABLE_VALUE_TYPE(switches::kEnableOverlayScrollbar, |
| - switches::kDisableOverlayScrollbar) |
| - }, |
| -#endif |
| - { |
| - "enable-panels", |
| - IDS_FLAGS_ENABLE_PANELS_NAME, |
| - IDS_FLAGS_ENABLE_PANELS_DESCRIPTION, |
| - kOsDesktop, |
| - SINGLE_VALUE_TYPE(switches::kEnablePanels) |
| - }, |
| - { |
| - // 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, |
| - SINGLE_VALUE_TYPE(switches::kSavePageAsMHTML) |
| - }, |
| - { |
| - "enable-quic", |
| - IDS_FLAGS_ENABLE_QUIC_NAME, |
| - IDS_FLAGS_ENABLE_QUIC_DESCRIPTION, |
| - kOsAll, |
| - ENABLE_DISABLE_VALUE_TYPE(switches::kEnableQuic, |
| - switches::kDisableQuic) |
| - }, |
| - { |
| - "enable-spdy4", |
| - IDS_FLAGS_ENABLE_SPDY4_NAME, |
| - IDS_FLAGS_ENABLE_SPDY4_DESCRIPTION, |
| - kOsAll, |
| - SINGLE_VALUE_TYPE(switches::kEnableSpdy4) |
| - }, |
| - { |
| - "enable-async-dns", |
| - IDS_FLAGS_ENABLE_ASYNC_DNS_NAME, |
| - IDS_FLAGS_ENABLE_ASYNC_DNS_DESCRIPTION, |
| - kOsWin | kOsMac | kOsLinux | kOsCrOS, |
| - ENABLE_DISABLE_VALUE_TYPE(switches::kEnableAsyncDns, |
| - switches::kDisableAsyncDns) |
| - }, |
| - { |
| - "disable-media-source", |
| - IDS_FLAGS_DISABLE_MEDIA_SOURCE_NAME, |
| - IDS_FLAGS_DISABLE_MEDIA_SOURCE_DESCRIPTION, |
| - kOsAll, |
| - SINGLE_VALUE_TYPE(switches::kDisableMediaSource) |
| - }, |
| - { |
| - "enable-encrypted-media", |
| - IDS_FLAGS_ENABLE_ENCRYPTED_MEDIA_NAME, |
| - IDS_FLAGS_ENABLE_ENCRYPTED_MEDIA_DESCRIPTION, |
| - kOsAll, |
| - SINGLE_VALUE_TYPE(switches::kEnableEncryptedMedia) |
| - }, |
| - { |
| - "disable-prefixed-encrypted-media", |
| - IDS_FLAGS_DISABLE_PREFIXED_ENCRYPTED_MEDIA_NAME, |
| - IDS_FLAGS_DISABLE_PREFIXED_ENCRYPTED_MEDIA_DESCRIPTION, |
| - kOsAll, |
| - SINGLE_VALUE_TYPE(switches::kDisablePrefixedEncryptedMedia) |
| - }, |
| + {"overlay-scrollbars", |
| + IDS_FLAGS_ENABLE_OVERLAY_SCROLLBARS_NAME, |
| + IDS_FLAGS_ENABLE_OVERLAY_SCROLLBARS_DESCRIPTION, |
| + // Uses the system preference on Mac (a different implementation). |
| + // On Android, this is always enabled. |
| + kOsLinux | kOsCrOS | kOsWin, |
| + ENABLE_DISABLE_VALUE_TYPE(switches::kEnableOverlayScrollbar, |
| + switches::kDisableOverlayScrollbar)}, |
| +#endif |
| + {"enable-panels", |
| + IDS_FLAGS_ENABLE_PANELS_NAME, |
| + IDS_FLAGS_ENABLE_PANELS_DESCRIPTION, |
| + kOsDesktop, |
| + SINGLE_VALUE_TYPE(switches::kEnablePanels)}, |
| + {// 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, |
| + SINGLE_VALUE_TYPE(switches::kSavePageAsMHTML)}, |
| + {"enable-quic", |
| + IDS_FLAGS_ENABLE_QUIC_NAME, |
| + IDS_FLAGS_ENABLE_QUIC_DESCRIPTION, |
| + kOsAll, |
| + ENABLE_DISABLE_VALUE_TYPE(switches::kEnableQuic, switches::kDisableQuic)}, |
| + {"enable-spdy4", |
| + IDS_FLAGS_ENABLE_SPDY4_NAME, |
| + IDS_FLAGS_ENABLE_SPDY4_DESCRIPTION, |
| + kOsAll, |
| + SINGLE_VALUE_TYPE(switches::kEnableSpdy4)}, |
| + {"enable-async-dns", |
| + IDS_FLAGS_ENABLE_ASYNC_DNS_NAME, |
| + IDS_FLAGS_ENABLE_ASYNC_DNS_DESCRIPTION, |
| + kOsWin | kOsMac | kOsLinux | kOsCrOS, |
| + ENABLE_DISABLE_VALUE_TYPE(switches::kEnableAsyncDns, |
| + switches::kDisableAsyncDns)}, |
| + {"disable-media-source", |
| + IDS_FLAGS_DISABLE_MEDIA_SOURCE_NAME, |
| + IDS_FLAGS_DISABLE_MEDIA_SOURCE_DESCRIPTION, |
| + kOsAll, |
| + SINGLE_VALUE_TYPE(switches::kDisableMediaSource)}, |
| + {"enable-encrypted-media", |
| + IDS_FLAGS_ENABLE_ENCRYPTED_MEDIA_NAME, |
| + IDS_FLAGS_ENABLE_ENCRYPTED_MEDIA_DESCRIPTION, |
| + kOsAll, |
| + SINGLE_VALUE_TYPE(switches::kEnableEncryptedMedia)}, |
| + {"disable-prefixed-encrypted-media", |
| + IDS_FLAGS_DISABLE_PREFIXED_ENCRYPTED_MEDIA_NAME, |
| + IDS_FLAGS_DISABLE_PREFIXED_ENCRYPTED_MEDIA_DESCRIPTION, |
| + kOsAll, |
| + SINGLE_VALUE_TYPE(switches::kDisablePrefixedEncryptedMedia)}, |
| #if defined(OS_ANDROID) |
| - { |
| - "disable-infobar-for-protected-media-identifier", |
| - IDS_FLAGS_DISABLE_INFOBAR_FOR_PROTECTED_MEDIA_IDENTIFIER_NAME, |
| - IDS_FLAGS_DISABLE_INFOBAR_FOR_PROTECTED_MEDIA_IDENTIFIER_DESCRIPTION, |
| - kOsAndroid, |
| - SINGLE_VALUE_TYPE(switches::kDisableInfobarForProtectedMediaIdentifier) |
| - }, |
| - { |
| - "mediadrm-enable-non-compositing", |
| - IDS_FLAGS_MEDIADRM_ENABLE_NON_COMPOSITING_NAME, |
| - IDS_FLAGS_MEDIADRM_ENABLE_NON_COMPOSITING_DESCRIPTION, |
| - kOsAndroid, |
| - SINGLE_VALUE_TYPE(switches::kMediaDrmEnableNonCompositing) |
| - }, |
| + {"disable-infobar-for-protected-media-identifier", |
| + IDS_FLAGS_DISABLE_INFOBAR_FOR_PROTECTED_MEDIA_IDENTIFIER_NAME, |
| + IDS_FLAGS_DISABLE_INFOBAR_FOR_PROTECTED_MEDIA_IDENTIFIER_DESCRIPTION, |
| + kOsAndroid, |
| + SINGLE_VALUE_TYPE(switches::kDisableInfobarForProtectedMediaIdentifier)}, |
| + {"mediadrm-enable-non-compositing", |
| + IDS_FLAGS_MEDIADRM_ENABLE_NON_COMPOSITING_NAME, |
| + IDS_FLAGS_MEDIADRM_ENABLE_NON_COMPOSITING_DESCRIPTION, |
| + kOsAndroid, |
| + SINGLE_VALUE_TYPE(switches::kMediaDrmEnableNonCompositing)}, |
| #endif // defined(OS_ANDROID) |
| - { |
| - "disable-javascript-harmony-shipping", |
| - IDS_FLAGS_DISABLE_JAVASCRIPT_HARMONY_SHIPPING_NAME, |
| - IDS_FLAGS_DISABLE_JAVASCRIPT_HARMONY_SHIPPING_DESCRIPTION, |
| - kOsAll, |
| - SINGLE_VALUE_TYPE(switches::kDisableJavaScriptHarmonyShipping) |
| - }, |
| - { |
| - "enable-javascript-harmony", |
| - IDS_FLAGS_ENABLE_JAVASCRIPT_HARMONY_NAME, |
| - IDS_FLAGS_ENABLE_JAVASCRIPT_HARMONY_DESCRIPTION, |
| - kOsAll, |
| - SINGLE_VALUE_TYPE(switches::kJavaScriptHarmony) |
| - }, |
| - { |
| - "disable-software-rasterizer", |
| - IDS_FLAGS_DISABLE_SOFTWARE_RASTERIZER_NAME, |
| - IDS_FLAGS_DISABLE_SOFTWARE_RASTERIZER_DESCRIPTION, |
| + {"disable-javascript-harmony-shipping", |
| + IDS_FLAGS_DISABLE_JAVASCRIPT_HARMONY_SHIPPING_NAME, |
| + IDS_FLAGS_DISABLE_JAVASCRIPT_HARMONY_SHIPPING_DESCRIPTION, |
| + kOsAll, |
| + SINGLE_VALUE_TYPE(switches::kDisableJavaScriptHarmonyShipping)}, |
| + {"enable-javascript-harmony", |
| + IDS_FLAGS_ENABLE_JAVASCRIPT_HARMONY_NAME, |
| + IDS_FLAGS_ENABLE_JAVASCRIPT_HARMONY_DESCRIPTION, |
| + kOsAll, |
| + SINGLE_VALUE_TYPE(switches::kJavaScriptHarmony)}, |
| + {"disable-software-rasterizer", |
| + IDS_FLAGS_DISABLE_SOFTWARE_RASTERIZER_NAME, |
| + IDS_FLAGS_DISABLE_SOFTWARE_RASTERIZER_DESCRIPTION, |
| #if defined(ENABLE_SWIFTSHADER) |
| - kOsAll, |
| + kOsAll, |
| #else |
| - 0, |
| -#endif |
| - SINGLE_VALUE_TYPE(switches::kDisableSoftwareRasterizer) |
| - }, |
| - { |
| - "enable-gpu-rasterization", |
| - IDS_FLAGS_ENABLE_GPU_RASTERIZATION_NAME, |
| - IDS_FLAGS_ENABLE_GPU_RASTERIZATION_DESCRIPTION, |
| - kOsAll, |
| - MULTI_VALUE_TYPE(kEnableGpuRasterizationChoices) |
| - }, |
| - { |
| - "enable-experimental-web-platform-features", |
| - IDS_FLAGS_EXPERIMENTAL_WEB_PLATFORM_FEATURES_NAME, |
| - IDS_FLAGS_EXPERIMENTAL_WEB_PLATFORM_FEATURES_DESCRIPTION, |
| - kOsAll, |
| - SINGLE_VALUE_TYPE(switches::kEnableExperimentalWebPlatformFeatures) |
| - }, |
| - { |
| - "disable-ntp-other-sessions-menu", |
| - IDS_FLAGS_NTP_OTHER_SESSIONS_MENU_NAME, |
| - IDS_FLAGS_NTP_OTHER_SESSIONS_MENU_DESCRIPTION, |
| - kOsDesktop, |
| - SINGLE_VALUE_TYPE(switches::kDisableNTPOtherSessionsMenu) |
| - }, |
| - { |
| - "enable-devtools-experiments", |
| - IDS_FLAGS_ENABLE_DEVTOOLS_EXPERIMENTS_NAME, |
| - IDS_FLAGS_ENABLE_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, |
| - SINGLE_VALUE_TYPE(switches::kSilentDebuggerExtensionAPI) |
| - }, |
| + 0, |
| +#endif |
| + SINGLE_VALUE_TYPE(switches::kDisableSoftwareRasterizer)}, |
| + {"enable-gpu-rasterization", |
| + IDS_FLAGS_ENABLE_GPU_RASTERIZATION_NAME, |
| + IDS_FLAGS_ENABLE_GPU_RASTERIZATION_DESCRIPTION, |
| + kOsAll, |
| + MULTI_VALUE_TYPE(kEnableGpuRasterizationChoices)}, |
| + {"enable-experimental-web-platform-features", |
| + IDS_FLAGS_EXPERIMENTAL_WEB_PLATFORM_FEATURES_NAME, |
| + IDS_FLAGS_EXPERIMENTAL_WEB_PLATFORM_FEATURES_DESCRIPTION, |
| + kOsAll, |
| + SINGLE_VALUE_TYPE(switches::kEnableExperimentalWebPlatformFeatures)}, |
| + {"disable-ntp-other-sessions-menu", |
| + IDS_FLAGS_NTP_OTHER_SESSIONS_MENU_NAME, |
| + IDS_FLAGS_NTP_OTHER_SESSIONS_MENU_DESCRIPTION, |
| + kOsDesktop, |
| + SINGLE_VALUE_TYPE(switches::kDisableNTPOtherSessionsMenu)}, |
| + {"enable-devtools-experiments", |
| + IDS_FLAGS_ENABLE_DEVTOOLS_EXPERIMENTS_NAME, |
| + IDS_FLAGS_ENABLE_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, |
| + SINGLE_VALUE_TYPE(switches::kSilentDebuggerExtensionAPI)}, |
| #if defined(ENABLE_SPELLCHECK) |
| - { |
| - "spellcheck-autocorrect", |
| - IDS_FLAGS_SPELLCHECK_AUTOCORRECT, |
| - IDS_FLAGS_SPELLCHECK_AUTOCORRECT_DESCRIPTION, |
| - kOsWin | kOsLinux | kOsCrOS, |
| - SINGLE_VALUE_TYPE(switches::kEnableSpellingAutoCorrect) |
| - }, |
| -#endif |
| - { |
| - "enable-scroll-prediction", |
| - IDS_FLAGS_ENABLE_SCROLL_PREDICTION_NAME, |
| - IDS_FLAGS_ENABLE_SCROLL_PREDICTION_DESCRIPTION, |
| - kOsDesktop, |
| - SINGLE_VALUE_TYPE(switches::kEnableScrollPrediction) |
| - }, |
| - { |
| - "touch-events", |
| - IDS_TOUCH_EVENTS_NAME, |
| - IDS_TOUCH_EVENTS_DESCRIPTION, |
| - kOsDesktop, |
| - MULTI_VALUE_TYPE(kTouchEventsChoices) |
| - }, |
| - { |
| - "disable-touch-adjustment", |
| - IDS_DISABLE_TOUCH_ADJUSTMENT_NAME, |
| - IDS_DISABLE_TOUCH_ADJUSTMENT_DESCRIPTION, |
| - kOsWin | kOsLinux | kOsCrOS | kOsAndroid, |
| - SINGLE_VALUE_TYPE(switches::kDisableTouchAdjustment) |
| - }, |
| + {"spellcheck-autocorrect", |
| + IDS_FLAGS_SPELLCHECK_AUTOCORRECT, |
| + IDS_FLAGS_SPELLCHECK_AUTOCORRECT_DESCRIPTION, |
| + kOsWin | kOsLinux | kOsCrOS, |
| + SINGLE_VALUE_TYPE(switches::kEnableSpellingAutoCorrect)}, |
| +#endif |
| + {"enable-scroll-prediction", |
| + IDS_FLAGS_ENABLE_SCROLL_PREDICTION_NAME, |
| + IDS_FLAGS_ENABLE_SCROLL_PREDICTION_DESCRIPTION, |
| + kOsDesktop, |
| + SINGLE_VALUE_TYPE(switches::kEnableScrollPrediction)}, |
| + {"touch-events", |
| + IDS_TOUCH_EVENTS_NAME, |
| + IDS_TOUCH_EVENTS_DESCRIPTION, |
| + kOsDesktop, |
| + MULTI_VALUE_TYPE(kTouchEventsChoices)}, |
| + {"disable-touch-adjustment", |
| + IDS_DISABLE_TOUCH_ADJUSTMENT_NAME, |
| + IDS_DISABLE_TOUCH_ADJUSTMENT_DESCRIPTION, |
| + kOsWin | kOsLinux | kOsCrOS | kOsAndroid, |
| + SINGLE_VALUE_TYPE(switches::kDisableTouchAdjustment)}, |
| #if defined(OS_CHROMEOS) |
| - { |
| - "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_ENABLE_DOWNLOAD_RESUMPTION_NAME, |
| - IDS_FLAGS_ENABLE_DOWNLOAD_RESUMPTION_DESCRIPTION, |
| - kOsDesktop, |
| - SINGLE_VALUE_TYPE(switches::kEnableDownloadResumption) |
| - }, |
| + {"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_ENABLE_DOWNLOAD_RESUMPTION_NAME, |
| + IDS_FLAGS_ENABLE_DOWNLOAD_RESUMPTION_DESCRIPTION, |
| + kOsDesktop, |
| + SINGLE_VALUE_TYPE(switches::kEnableDownloadResumption)}, |
| #if defined(ENABLE_PLUGINS) |
| - { |
| - "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, "*") |
| - }, |
| + {"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, |
| - SINGLE_VALUE_TYPE(chromeos::switches::kEnableTouchpadThreeFingerClick) |
| - }, |
| - { |
| - "disable-easy-unlock", |
| - IDS_FLAGS_DISABLE_EASY_UNLOCK_NAME, |
| - IDS_FLAGS_DISABLE_EASY_UNLOCK_DESCRIPTION, |
| - kOsCrOS, |
| - SINGLE_VALUE_TYPE(proximity_auth::switches::kDisableEasyUnlock) |
| - }, |
| - { |
| - "enable-easy-unlock-proximity-detection", |
| - IDS_FLAGS_ENABLE_EASY_UNLOCK_PROXIMITY_DETECTION_NAME, |
| - IDS_FLAGS_ENABLE_EASY_UNLOCK_PROXIMITY_DETECTION_DESCRIPTION, |
| - kOsCrOS, |
| - SINGLE_VALUE_TYPE(proximity_auth::switches::kEnableProximityDetection) |
| - }, |
| + {"allow-touchpad-three-finger-click", |
| + IDS_FLAGS_ALLOW_TOUCHPAD_THREE_FINGER_CLICK_NAME, |
| + IDS_FLAGS_ALLOW_TOUCHPAD_THREE_FINGER_CLICK_DESCRIPTION, |
| + kOsCrOS, |
| + SINGLE_VALUE_TYPE(chromeos::switches::kEnableTouchpadThreeFingerClick)}, |
| + {"disable-easy-unlock", |
| + IDS_FLAGS_DISABLE_EASY_UNLOCK_NAME, |
| + IDS_FLAGS_DISABLE_EASY_UNLOCK_DESCRIPTION, |
| + kOsCrOS, |
| + SINGLE_VALUE_TYPE(proximity_auth::switches::kDisableEasyUnlock)}, |
| + {"enable-easy-unlock-proximity-detection", |
| + IDS_FLAGS_ENABLE_EASY_UNLOCK_PROXIMITY_DETECTION_NAME, |
| + IDS_FLAGS_ENABLE_EASY_UNLOCK_PROXIMITY_DETECTION_DESCRIPTION, |
| + kOsCrOS, |
| + SINGLE_VALUE_TYPE(proximity_auth::switches::kEnableProximityDetection)}, |
| #endif |
| #if defined(USE_ASH) |
| - { |
| - "disable-minimize-on-second-launcher-item-click", |
| - IDS_FLAGS_DISABLE_MINIMIZE_ON_SECOND_LAUNCHER_ITEM_CLICK_NAME, |
| - IDS_FLAGS_DISABLE_MINIMIZE_ON_SECOND_LAUNCHER_ITEM_CLICK_DESCRIPTION, |
| - kOsAll, |
| - SINGLE_VALUE_TYPE(switches::kDisableMinimizeOnSecondLauncherItemClick) |
| - }, |
| - { |
| - "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_ENABLE_PINCH_SCALE_NAME, |
| - IDS_FLAGS_ENABLE_PINCH_SCALE_DESCRIPTION, |
| - kOsLinux | kOsWin | kOsCrOS, |
| - ENABLE_DISABLE_VALUE_TYPE(switches::kEnablePinch, switches::kDisablePinch), |
| - }, |
| + {"disable-minimize-on-second-launcher-item-click", |
| + IDS_FLAGS_DISABLE_MINIMIZE_ON_SECOND_LAUNCHER_ITEM_CLICK_NAME, |
| + IDS_FLAGS_DISABLE_MINIMIZE_ON_SECOND_LAUNCHER_ITEM_CLICK_DESCRIPTION, |
| + kOsAll, |
| + SINGLE_VALUE_TYPE(switches::kDisableMinimizeOnSecondLauncherItemClick)}, |
| + {"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_ENABLE_PINCH_SCALE_NAME, |
| + IDS_FLAGS_ENABLE_PINCH_SCALE_DESCRIPTION, |
| + kOsLinux | kOsWin | kOsCrOS, |
| + ENABLE_DISABLE_VALUE_TYPE(switches::kEnablePinch, switches::kDisablePinch), |
| + }, |
| #endif // defined(USE_ASH) |
| - { |
| - "enable-pinch-virtual-viewport", |
| - IDS_FLAGS_ENABLE_PINCH_VIRTUAL_VIEWPORT_NAME, |
| - IDS_FLAGS_ENABLE_PINCH_VIRTUAL_VIEWPORT_DESCRIPTION, |
| - kOsLinux | kOsWin | kOsCrOS | kOsAndroid, |
| - ENABLE_DISABLE_VALUE_TYPE( |
| - cc::switches::kEnablePinchVirtualViewport, |
| - cc::switches::kDisablePinchVirtualViewport), |
| - }, |
| - { |
| - "enable-viewport-meta", |
| - IDS_FLAGS_ENABLE_VIEWPORT_META_NAME, |
| - IDS_FLAGS_ENABLE_VIEWPORT_META_DESCRIPTION, |
| - kOsLinux | kOsWin | kOsCrOS | kOsMac, |
| - SINGLE_VALUE_TYPE(switches::kEnableViewportMeta), |
| - }, |
| + { |
| + "enable-pinch-virtual-viewport", |
| + IDS_FLAGS_ENABLE_PINCH_VIRTUAL_VIEWPORT_NAME, |
| + IDS_FLAGS_ENABLE_PINCH_VIRTUAL_VIEWPORT_DESCRIPTION, |
| + kOsLinux | kOsWin | kOsCrOS | kOsAndroid, |
| + ENABLE_DISABLE_VALUE_TYPE(cc::switches::kEnablePinchVirtualViewport, |
| + cc::switches::kDisablePinchVirtualViewport), |
| + }, |
| + { |
| + "enable-viewport-meta", |
| + IDS_FLAGS_ENABLE_VIEWPORT_META_NAME, |
| + IDS_FLAGS_ENABLE_VIEWPORT_META_DESCRIPTION, |
| + kOsLinux | kOsWin | kOsCrOS | kOsMac, |
| + SINGLE_VALUE_TYPE(switches::kEnableViewportMeta), |
| + }, |
| #if defined(OS_CHROMEOS) |
| - { |
| - "disable-boot-animation", |
| - IDS_FLAGS_DISABLE_BOOT_ANIMATION, |
| - IDS_FLAGS_DISABLE_BOOT_ANIMATION_DESCRIPTION, |
| - kOsCrOSOwnerOnly, |
| - SINGLE_VALUE_TYPE(chromeos::switches::kDisableBootAnimation), |
| - }, |
| - { |
| - "enable-video-player-chromecast-support", |
| - IDS_FLAGS_ENABLE_VIDEO_PLAYER_CHROMECAST_SUPPORT_NAME, |
| - IDS_FLAGS_ENABLE_VIDEO_PLAYER_CHROMECAST_SUPPORT_DESCRIPTION, |
| - kOsCrOS, |
| - SINGLE_VALUE_TYPE(chromeos::switches::kEnableVideoPlayerChromecastSupport) |
| - }, |
| - { |
| - "disable-office-editing-component-app", |
| - IDS_FLAGS_DISABLE_OFFICE_EDITING_COMPONENT_APP_NAME, |
| - IDS_FLAGS_DISABLE_OFFICE_EDITING_COMPONENT_APP_DESCRIPTION, |
| - kOsCrOS, |
| - SINGLE_VALUE_TYPE(chromeos::switches::kDisableOfficeEditingComponentApp), |
| - }, |
| - { |
| - "disable-display-color-calibration", |
| - IDS_FLAGS_DISABLE_DISPLAY_COLOR_CALIBRATION_NAME, |
| - IDS_FLAGS_DISABLE_DISPLAY_COLOR_CALIBRATION_DESCRIPTION, |
| - kOsCrOS, |
| - SINGLE_VALUE_TYPE(ui::switches::kDisableDisplayColorCalibration), |
| - }, |
| + { |
| + "disable-boot-animation", |
| + IDS_FLAGS_DISABLE_BOOT_ANIMATION, |
| + IDS_FLAGS_DISABLE_BOOT_ANIMATION_DESCRIPTION, |
| + kOsCrOSOwnerOnly, |
| + SINGLE_VALUE_TYPE(chromeos::switches::kDisableBootAnimation), |
| + }, |
| + {"enable-video-player-chromecast-support", |
| + IDS_FLAGS_ENABLE_VIDEO_PLAYER_CHROMECAST_SUPPORT_NAME, |
| + IDS_FLAGS_ENABLE_VIDEO_PLAYER_CHROMECAST_SUPPORT_DESCRIPTION, |
| + kOsCrOS, |
| + SINGLE_VALUE_TYPE( |
| + chromeos::switches::kEnableVideoPlayerChromecastSupport)}, |
| + { |
| + "disable-office-editing-component-app", |
| + IDS_FLAGS_DISABLE_OFFICE_EDITING_COMPONENT_APP_NAME, |
| + IDS_FLAGS_DISABLE_OFFICE_EDITING_COMPONENT_APP_DESCRIPTION, |
| + kOsCrOS, |
| + SINGLE_VALUE_TYPE(chromeos::switches::kDisableOfficeEditingComponentApp), |
| + }, |
| + { |
| + "disable-display-color-calibration", |
| + IDS_FLAGS_DISABLE_DISPLAY_COLOR_CALIBRATION_NAME, |
| + IDS_FLAGS_DISABLE_DISPLAY_COLOR_CALIBRATION_DESCRIPTION, |
| + kOsCrOS, |
| + SINGLE_VALUE_TYPE(ui::switches::kDisableDisplayColorCalibration), |
| + }, |
| #endif // defined(OS_CHROMEOS) |
| - { "disable-accelerated-video-decode", |
| - IDS_FLAGS_DISABLE_ACCELERATED_VIDEO_DECODE_NAME, |
| - IDS_FLAGS_DISABLE_ACCELERATED_VIDEO_DECODE_DESCRIPTION, |
| - kOsWin | kOsCrOS, |
| - SINGLE_VALUE_TYPE(switches::kDisableAcceleratedVideoDecode), |
| - }, |
| + { |
| + "disable-accelerated-video-decode", |
| + IDS_FLAGS_DISABLE_ACCELERATED_VIDEO_DECODE_NAME, |
| + IDS_FLAGS_DISABLE_ACCELERATED_VIDEO_DECODE_DESCRIPTION, |
| + kOsWin | kOsCrOS, |
| + SINGLE_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-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_DISABLE_TOUCH_FEEDBACK_NAME, |
| - IDS_FLAGS_DISABLE_TOUCH_FEEDBACK_DESCRIPTION, |
| - kOsCrOS, |
| - SINGLE_VALUE_TYPE(switches::kDisableTouchFeedback), |
| - }, |
| - { "ash-disable-text-filtering-in-overview-mode", |
| - IDS_FLAGS_ASH_DISABLE_TEXT_FILTERING_IN_OVERVIEW_MODE_NAME, |
| - IDS_FLAGS_ASH_DISABLE_TEXT_FILTERING_IN_OVERVIEW_MODE_DESCRIPTION, |
| - kOsCrOS, |
| - SINGLE_VALUE_TYPE(ash::switches::kAshDisableTextFilteringInOverviewMode), |
| - }, |
| - { "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-debug-shortcuts", |
| + IDS_FLAGS_DEBUG_SHORTCUTS_NAME, |
| + IDS_FLAGS_DEBUG_SHORTCUTS_DESCRIPTION, |
| + kOsAll, |
| + SINGLE_VALUE_TYPE(ash::switches::kAshDebugShortcuts), |
| + }, |
| + { |
| + "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_DISABLE_TOUCH_FEEDBACK_NAME, |
| + IDS_FLAGS_DISABLE_TOUCH_FEEDBACK_DESCRIPTION, |
| + kOsCrOS, |
| + SINGLE_VALUE_TYPE(switches::kDisableTouchFeedback), |
| + }, |
| + { |
| + "ash-disable-text-filtering-in-overview-mode", |
| + IDS_FLAGS_ASH_DISABLE_TEXT_FILTERING_IN_OVERVIEW_MODE_NAME, |
| + IDS_FLAGS_ASH_DISABLE_TEXT_FILTERING_IN_OVERVIEW_MODE_DESCRIPTION, |
| + kOsCrOS, |
| + SINGLE_VALUE_TYPE(ash::switches::kAshDisableTextFilteringInOverviewMode), |
| + }, |
| + { |
| + "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), |
| + }, |
| #endif // defined(USE_ASH) |
| #if defined(OS_CHROMEOS) |
| - { |
| - "enable-carrier-switching", |
| - IDS_FLAGS_ENABLE_CARRIER_SWITCHING, |
| - IDS_FLAGS_ENABLE_CARRIER_SWITCHING_DESCRIPTION, |
| - kOsCrOS, |
| - SINGLE_VALUE_TYPE(chromeos::switches::kEnableCarrierSwitching) |
| - }, |
| - { |
| - "enable-cloud-backup", |
| - IDS_FLAGS_ENABLE_CLOUD_BACKUP, |
| - IDS_FLAGS_ENABLE_CLOUD_BACKUP_DESCRIPTION, |
| - kOsCrOS, |
| - SINGLE_VALUE_TYPE(chromeos::switches::kEnableCloudBackup) |
| - }, |
| - { |
| - "enable-request-tablet-site", |
| - IDS_FLAGS_ENABLE_REQUEST_TABLET_SITE_NAME, |
| - IDS_FLAGS_ENABLE_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, |
| - SINGLE_VALUE_TYPE(switches::kDebugPackedApps) |
| - }, |
| - { |
| - "enable-password-generation", |
| - IDS_FLAGS_ENABLE_PASSWORD_GENERATION_NAME, |
| - IDS_FLAGS_ENABLE_PASSWORD_GENERATION_DESCRIPTION, |
| - kOsWin | kOsLinux | kOsCrOS | kOsMac | kOsAndroid, |
| - ENABLE_DISABLE_VALUE_TYPE(autofill::switches::kEnablePasswordGeneration, |
| - autofill::switches::kDisablePasswordGeneration) |
| - }, |
| - { |
| - "enable-automatic-password-saving", |
| - IDS_FLAGS_ENABLE_AUTOMATIC_PASSWORD_SAVING_NAME, |
| - IDS_FLAGS_ENABLE_AUTOMATIC_PASSWORD_SAVING_DESCRIPTION, |
| - kOsDesktop, |
| - SINGLE_VALUE_TYPE( |
| - password_manager::switches::kEnableAutomaticPasswordSaving) |
| - }, |
| - { |
| - "password-manager-reauthentication", |
| - IDS_FLAGS_PASSWORD_MANAGER_REAUTHENTICATION_NAME, |
| - IDS_FLAGS_PASSWORD_MANAGER_REAUTHENTICATION_DESCRIPTION, |
| - kOsMac | kOsWin, |
| - SINGLE_VALUE_TYPE(switches::kDisablePasswordManagerReauthentication) |
| - }, |
| - { |
| - "enable-password-link", |
| - IDS_FLAGS_PASSWORD_MANAGER_LINK_NAME, |
| - IDS_FLAGS_PASSWORD_MANAGER_LINK_DESCRIPTION, |
| - kOsAndroid | kOsDesktop, |
| - ENABLE_DISABLE_VALUE_TYPE( |
| - password_manager::switches::kEnablePasswordLink, |
| - password_manager::switches::kDisablePasswordLink) |
| - }, |
| - { |
| - "enable-deferred-image-decoding", |
| - IDS_FLAGS_ENABLE_DEFERRED_IMAGE_DECODING_NAME, |
| - IDS_FLAGS_ENABLE_DEFERRED_IMAGE_DECODING_DESCRIPTION, |
| - kOsMac | kOsLinux | kOsCrOS, |
| - SINGLE_VALUE_TYPE(switches::kEnableDeferredImageDecoding) |
| - }, |
| - { |
| - "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", |
| - autofill::switches::kWalletServiceUseSandbox, "0") |
| - }, |
| + {"enable-carrier-switching", |
| + IDS_FLAGS_ENABLE_CARRIER_SWITCHING, |
| + IDS_FLAGS_ENABLE_CARRIER_SWITCHING_DESCRIPTION, |
| + kOsCrOS, |
| + SINGLE_VALUE_TYPE(chromeos::switches::kEnableCarrierSwitching)}, |
| + {"enable-cloud-backup", |
| + IDS_FLAGS_ENABLE_CLOUD_BACKUP, |
| + IDS_FLAGS_ENABLE_CLOUD_BACKUP_DESCRIPTION, |
| + kOsCrOS, |
| + SINGLE_VALUE_TYPE(chromeos::switches::kEnableCloudBackup)}, |
| + {"enable-request-tablet-site", |
| + IDS_FLAGS_ENABLE_REQUEST_TABLET_SITE_NAME, |
| + IDS_FLAGS_ENABLE_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, |
| + SINGLE_VALUE_TYPE(switches::kDebugPackedApps)}, |
| + {"enable-password-generation", |
| + IDS_FLAGS_ENABLE_PASSWORD_GENERATION_NAME, |
| + IDS_FLAGS_ENABLE_PASSWORD_GENERATION_DESCRIPTION, |
| + kOsWin | kOsLinux | kOsCrOS | kOsMac | kOsAndroid, |
| + ENABLE_DISABLE_VALUE_TYPE(autofill::switches::kEnablePasswordGeneration, |
| + autofill::switches::kDisablePasswordGeneration)}, |
| + {"enable-automatic-password-saving", |
| + IDS_FLAGS_ENABLE_AUTOMATIC_PASSWORD_SAVING_NAME, |
| + IDS_FLAGS_ENABLE_AUTOMATIC_PASSWORD_SAVING_DESCRIPTION, |
| + kOsDesktop, |
| + SINGLE_VALUE_TYPE( |
| + password_manager::switches::kEnableAutomaticPasswordSaving)}, |
| + {"password-manager-reauthentication", |
| + IDS_FLAGS_PASSWORD_MANAGER_REAUTHENTICATION_NAME, |
| + IDS_FLAGS_PASSWORD_MANAGER_REAUTHENTICATION_DESCRIPTION, |
| + kOsMac | kOsWin, |
| + SINGLE_VALUE_TYPE(switches::kDisablePasswordManagerReauthentication)}, |
| + {"enable-password-link", |
| + IDS_FLAGS_PASSWORD_MANAGER_LINK_NAME, |
| + IDS_FLAGS_PASSWORD_MANAGER_LINK_DESCRIPTION, |
| + kOsAndroid | kOsDesktop, |
| + ENABLE_DISABLE_VALUE_TYPE( |
| + password_manager::switches::kEnablePasswordLink, |
| + password_manager::switches::kDisablePasswordLink)}, |
| + {"enable-deferred-image-decoding", |
| + IDS_FLAGS_ENABLE_DEFERRED_IMAGE_DECODING_NAME, |
| + IDS_FLAGS_ENABLE_DEFERRED_IMAGE_DECODING_DESCRIPTION, |
| + kOsMac | kOsLinux | kOsCrOS, |
| + SINGLE_VALUE_TYPE(switches::kEnableDeferredImageDecoding)}, |
| + {"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", |
| + autofill::switches::kWalletServiceUseSandbox, |
| + "0")}, |
| #if defined(USE_AURA) |
| - { |
| - "overscroll-history-navigation", |
| - IDS_FLAGS_OVERSCROLL_HISTORY_NAVIGATION_NAME, |
| - 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, |
| - ENABLE_DISABLE_VALUE_TYPE_AND_VALUE( |
| - switches::kScrollEndEffect, "1", |
| - switches::kScrollEndEffect, "0") |
| - }, |
| - { |
| - "enable-renderer-mojo-channel", |
| - IDS_FLAGS_ENABLE_RENDERER_MOJO_CHANNEL_NAME, |
| - IDS_FLAGS_ENABLE_RENDERER_MOJO_CHANNEL_DESCRIPTION, |
| - kOsAll, |
| - SINGLE_VALUE_TYPE(switches::kEnableRendererMojoChannel) |
| - }, |
| - { |
| - "enable-touch-drag-drop", |
| - IDS_FLAGS_ENABLE_TOUCH_DRAG_DROP_NAME, |
| - IDS_FLAGS_ENABLE_TOUCH_DRAG_DROP_DESCRIPTION, |
| - kOsWin | kOsCrOS, |
| - ENABLE_DISABLE_VALUE_TYPE(switches::kEnableTouchDragDrop, |
| - switches::kDisableTouchDragDrop) |
| - }, |
| - { |
| - "enable-touch-editing", |
| - IDS_FLAGS_ENABLE_TOUCH_EDITING_NAME, |
| - IDS_FLAGS_ENABLE_TOUCH_EDITING_DESCRIPTION, |
| - kOsCrOS | kOsWin | kOsLinux, |
| - ENABLE_DISABLE_VALUE_TYPE(switches::kEnableTouchEditing, |
| - switches::kDisableTouchEditing) |
| - }, |
| - { |
| - "enable-stale-while-revalidate", |
| - IDS_FLAGS_ENABLE_STALE_WHILE_REVALIDATE_NAME, |
| - IDS_FLAGS_ENABLE_STALE_WHILE_REVALIDATE_DESCRIPTION, |
| - kOsAll, |
| - SINGLE_VALUE_TYPE(switches::kEnableStaleWhileRevalidate) |
| - }, |
| - { |
| - "enable-suggestions-service", |
| - IDS_FLAGS_ENABLE_SUGGESTIONS_SERVICE_NAME, |
| - IDS_FLAGS_ENABLE_SUGGESTIONS_SERVICE_DESCRIPTION, |
| - kOsAndroid | kOsCrOS, |
| - ENABLE_DISABLE_VALUE_TYPE(switches::kEnableSuggestionsService, |
| - switches::kDisableSuggestionsService) |
| - }, |
| - { |
| - "enable-supervised-user-blacklist", |
| - IDS_FLAGS_ENABLE_SUPERVISED_USER_BLACKLIST_NAME, |
| - IDS_FLAGS_ENABLE_SUPERVISED_USER_BLACKLIST_DESCRIPTION, |
| - kOsAndroid | kOsMac | kOsWin | kOsLinux | kOsCrOS, |
| - ENABLE_DISABLE_VALUE_TYPE(switches::kEnableSupervisedUserBlacklist, |
| - switches::kDisableSupervisedUserBlacklist) |
| - }, |
| - { |
| - "enable-supervised-user-safesites", |
| - IDS_FLAGS_ENABLE_SUPERVISED_USER_SAFESITES_NAME, |
| - IDS_FLAGS_ENABLE_SUPERVISED_USER_SAFESITES_DESCRIPTION, |
| - kOsAndroid | kOsMac | kOsWin | kOsLinux | kOsCrOS, |
| - ENABLE_DISABLE_VALUE_TYPE(switches::kEnableSupervisedUserSafeSites, |
| - switches::kDisableSupervisedUserSafeSites) |
| - }, |
| + {"overscroll-history-navigation", |
| + IDS_FLAGS_OVERSCROLL_HISTORY_NAVIGATION_NAME, |
| + 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, |
| + ENABLE_DISABLE_VALUE_TYPE_AND_VALUE(switches::kScrollEndEffect, |
| + "1", |
| + switches::kScrollEndEffect, |
| + "0")}, |
| + {"enable-renderer-mojo-channel", |
| + IDS_FLAGS_ENABLE_RENDERER_MOJO_CHANNEL_NAME, |
| + IDS_FLAGS_ENABLE_RENDERER_MOJO_CHANNEL_DESCRIPTION, |
| + kOsAll, |
| + SINGLE_VALUE_TYPE(switches::kEnableRendererMojoChannel)}, |
| + {"enable-touch-drag-drop", |
| + IDS_FLAGS_ENABLE_TOUCH_DRAG_DROP_NAME, |
| + IDS_FLAGS_ENABLE_TOUCH_DRAG_DROP_DESCRIPTION, |
| + kOsWin | kOsCrOS, |
| + ENABLE_DISABLE_VALUE_TYPE(switches::kEnableTouchDragDrop, |
| + switches::kDisableTouchDragDrop)}, |
| + {"enable-touch-editing", |
| + IDS_FLAGS_ENABLE_TOUCH_EDITING_NAME, |
| + IDS_FLAGS_ENABLE_TOUCH_EDITING_DESCRIPTION, |
| + kOsCrOS | kOsWin | kOsLinux, |
| + ENABLE_DISABLE_VALUE_TYPE(switches::kEnableTouchEditing, |
| + switches::kDisableTouchEditing)}, |
| + {"enable-stale-while-revalidate", |
| + IDS_FLAGS_ENABLE_STALE_WHILE_REVALIDATE_NAME, |
| + IDS_FLAGS_ENABLE_STALE_WHILE_REVALIDATE_DESCRIPTION, |
| + kOsAll, |
| + SINGLE_VALUE_TYPE(switches::kEnableStaleWhileRevalidate)}, |
| + {"enable-suggestions-service", |
| + IDS_FLAGS_ENABLE_SUGGESTIONS_SERVICE_NAME, |
| + IDS_FLAGS_ENABLE_SUGGESTIONS_SERVICE_DESCRIPTION, |
| + kOsAndroid | kOsCrOS, |
| + ENABLE_DISABLE_VALUE_TYPE(switches::kEnableSuggestionsService, |
| + switches::kDisableSuggestionsService)}, |
| + {"enable-supervised-user-blacklist", |
| + IDS_FLAGS_ENABLE_SUPERVISED_USER_BLACKLIST_NAME, |
| + IDS_FLAGS_ENABLE_SUPERVISED_USER_BLACKLIST_DESCRIPTION, |
| + kOsAndroid | kOsMac | kOsWin | kOsLinux | kOsCrOS, |
| + ENABLE_DISABLE_VALUE_TYPE(switches::kEnableSupervisedUserBlacklist, |
| + switches::kDisableSupervisedUserBlacklist)}, |
| + {"enable-supervised-user-safesites", |
| + IDS_FLAGS_ENABLE_SUPERVISED_USER_SAFESITES_NAME, |
| + IDS_FLAGS_ENABLE_SUPERVISED_USER_SAFESITES_DESCRIPTION, |
| + kOsAndroid | kOsMac | kOsWin | kOsLinux | kOsCrOS, |
| + ENABLE_DISABLE_VALUE_TYPE(switches::kEnableSupervisedUserSafeSites, |
| + switches::kDisableSupervisedUserSafeSites)}, |
| #if defined(ENABLE_APP_LIST) |
| - { |
| - "enable-sync-app-list", |
| - IDS_FLAGS_ENABLE_SYNC_APP_LIST_NAME, |
| - IDS_FLAGS_ENABLE_SYNC_APP_LIST_DESCRIPTION, |
| - kOsDesktop, |
| - ENABLE_DISABLE_VALUE_TYPE(app_list::switches::kEnableSyncAppList, |
| - app_list::switches::kDisableSyncAppList) |
| - }, |
| + {"enable-sync-app-list", |
| + IDS_FLAGS_ENABLE_SYNC_APP_LIST_NAME, |
| + IDS_FLAGS_ENABLE_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_ENABLE_AVFOUNDATION_NAME, |
| - IDS_FLAGS_ENABLE_AVFOUNDATION_DESCRIPTION, |
| - kOsMac, |
| - ENABLE_DISABLE_VALUE_TYPE(switches::kEnableAVFoundation, |
| - switches::kForceQTKit) |
| - }, |
| -#endif |
| - { |
| - "impl-side-painting", |
| - IDS_FLAGS_IMPL_SIDE_PAINTING_NAME, |
| - IDS_FLAGS_IMPL_SIDE_PAINTING_DESCRIPTION, |
| - kOsAll, |
| - ENABLE_DISABLE_VALUE_TYPE(switches::kEnableImplSidePainting, |
| - switches::kDisableImplSidePainting) |
| - }, |
| - { |
| - "lcd-text-aa", |
| - IDS_FLAGS_LCD_TEXT_NAME, |
| - IDS_FLAGS_LCD_TEXT_DESCRIPTION, |
| - kOsDesktop, |
| - ENABLE_DISABLE_VALUE_TYPE(switches::kEnableLCDText, |
| - switches::kDisableLCDText) |
| - }, |
| + {"enable-avfoundation", |
| + IDS_FLAGS_ENABLE_AVFOUNDATION_NAME, |
| + IDS_FLAGS_ENABLE_AVFOUNDATION_DESCRIPTION, |
| + kOsMac, |
| + ENABLE_DISABLE_VALUE_TYPE(switches::kEnableAVFoundation, |
| + switches::kForceQTKit)}, |
| +#endif |
| + {"impl-side-painting", |
| + IDS_FLAGS_IMPL_SIDE_PAINTING_NAME, |
| + IDS_FLAGS_IMPL_SIDE_PAINTING_DESCRIPTION, |
| + kOsAll, |
| + ENABLE_DISABLE_VALUE_TYPE(switches::kEnableImplSidePainting, |
| + switches::kDisableImplSidePainting)}, |
| + {"lcd-text-aa", |
| + IDS_FLAGS_LCD_TEXT_NAME, |
| + IDS_FLAGS_LCD_TEXT_DESCRIPTION, |
| + kOsDesktop, |
| + ENABLE_DISABLE_VALUE_TYPE(switches::kEnableLCDText, |
| + switches::kDisableLCDText)}, |
| #if defined(OS_ANDROID) || defined(OS_MACOSX) |
| - { |
| - "delegated-renderer", |
| - IDS_FLAGS_DELEGATED_RENDERER_NAME, |
| - IDS_FLAGS_DELEGATED_RENDERER_DESCRIPTION, |
| - kOsAndroid, // TODO(ccameron) Add mac support soon. |
| - ENABLE_DISABLE_VALUE_TYPE(switches::kEnableDelegatedRenderer, |
| - switches::kDisableDelegatedRenderer) |
| - }, |
| -#endif |
| - { |
| - "max-tiles-for-interest-area", |
| - IDS_FLAGS_MAX_TILES_FOR_INTEREST_AREA_NAME, |
| - IDS_FLAGS_MAX_TILES_FOR_INTEREST_AREA_DESCRIPTION, |
| - kOsAll, |
| - MULTI_VALUE_TYPE(kMaxTilesForInterestAreaChoices) |
| - }, |
| - { |
| - "enable-offline-auto-reload", |
| - IDS_FLAGS_ENABLE_OFFLINE_AUTO_RELOAD_NAME, |
| - IDS_FLAGS_ENABLE_OFFLINE_AUTO_RELOAD_DESCRIPTION, |
| - kOsAll, |
| - ENABLE_DISABLE_VALUE_TYPE(switches::kEnableOfflineAutoReload, |
| - switches::kDisableOfflineAutoReload) |
| - }, |
| - { |
| - "enable-offline-auto-reload-visible-only", |
| - IDS_FLAGS_ENABLE_OFFLINE_AUTO_RELOAD_VISIBLE_ONLY_NAME, |
| - IDS_FLAGS_ENABLE_OFFLINE_AUTO_RELOAD_VISIBLE_ONLY_DESCRIPTION, |
| - kOsAll, |
| - ENABLE_DISABLE_VALUE_TYPE(switches::kEnableOfflineAutoReloadVisibleOnly, |
| - switches::kDisableOfflineAutoReloadVisibleOnly) |
| - }, |
| - { |
| - "enable-offline-load-stale-cache", |
| - IDS_FLAGS_ENABLE_OFFLINE_LOAD_STALE_NAME, |
| - IDS_FLAGS_ENABLE_OFFLINE_LOAD_STALE_DESCRIPTION, |
| - kOsAll, |
| - ENABLE_DISABLE_VALUE_TYPE(switches::kEnableOfflineLoadStaleCache, |
| - switches::kDisableOfflineLoadStaleCache) |
| - }, |
| - { |
| - "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, |
| - MULTI_VALUE_TYPE(kDefaultTileHeightChoices) |
| - }, |
| + {"delegated-renderer", |
| + IDS_FLAGS_DELEGATED_RENDERER_NAME, |
| + IDS_FLAGS_DELEGATED_RENDERER_DESCRIPTION, |
| + kOsAndroid, // TODO(ccameron) Add mac support soon. |
| + ENABLE_DISABLE_VALUE_TYPE(switches::kEnableDelegatedRenderer, |
| + switches::kDisableDelegatedRenderer)}, |
| +#endif |
| + {"max-tiles-for-interest-area", |
| + IDS_FLAGS_MAX_TILES_FOR_INTEREST_AREA_NAME, |
| + IDS_FLAGS_MAX_TILES_FOR_INTEREST_AREA_DESCRIPTION, |
| + kOsAll, |
| + MULTI_VALUE_TYPE(kMaxTilesForInterestAreaChoices)}, |
| + {"enable-offline-auto-reload", |
| + IDS_FLAGS_ENABLE_OFFLINE_AUTO_RELOAD_NAME, |
| + IDS_FLAGS_ENABLE_OFFLINE_AUTO_RELOAD_DESCRIPTION, |
| + kOsAll, |
| + ENABLE_DISABLE_VALUE_TYPE(switches::kEnableOfflineAutoReload, |
| + switches::kDisableOfflineAutoReload)}, |
| + {"enable-offline-auto-reload-visible-only", |
| + IDS_FLAGS_ENABLE_OFFLINE_AUTO_RELOAD_VISIBLE_ONLY_NAME, |
| + IDS_FLAGS_ENABLE_OFFLINE_AUTO_RELOAD_VISIBLE_ONLY_DESCRIPTION, |
| + kOsAll, |
| + ENABLE_DISABLE_VALUE_TYPE(switches::kEnableOfflineAutoReloadVisibleOnly, |
| + switches::kDisableOfflineAutoReloadVisibleOnly)}, |
| + {"enable-offline-load-stale-cache", |
| + IDS_FLAGS_ENABLE_OFFLINE_LOAD_STALE_NAME, |
| + IDS_FLAGS_ENABLE_OFFLINE_LOAD_STALE_DESCRIPTION, |
| + kOsAll, |
| + ENABLE_DISABLE_VALUE_TYPE(switches::kEnableOfflineLoadStaleCache, |
| + switches::kDisableOfflineLoadStaleCache)}, |
| + {"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, |
| + MULTI_VALUE_TYPE(kDefaultTileHeightChoices)}, |
| #if defined(OS_ANDROID) |
| - { |
| - "disable-gesture-requirement-for-media-playback", |
| - IDS_FLAGS_DISABLE_GESTURE_REQUIREMENT_FOR_MEDIA_PLAYBACK_NAME, |
| - IDS_FLAGS_DISABLE_GESTURE_REQUIREMENT_FOR_MEDIA_PLAYBACK_DESCRIPTION, |
| - kOsAndroid, |
| - SINGLE_VALUE_TYPE(switches::kDisableGestureRequirementForMediaPlayback) |
| - }, |
| + {"disable-gesture-requirement-for-media-playback", |
| + IDS_FLAGS_DISABLE_GESTURE_REQUIREMENT_FOR_MEDIA_PLAYBACK_NAME, |
| + IDS_FLAGS_DISABLE_GESTURE_REQUIREMENT_FOR_MEDIA_PLAYBACK_DESCRIPTION, |
| + kOsAndroid, |
| + SINGLE_VALUE_TYPE(switches::kDisableGestureRequirementForMediaPlayback)}, |
| #endif |
| #if defined(ENABLE_EXTENSIONS) |
| - { |
| - "disable-extension-info-dialog", |
| - IDS_FLAGS_DISABLE_EXTENSION_INFO_DIALOG_NAME, |
| - IDS_FLAGS_DISABLE_EXTENSION_INFO_DIALOG_DESCRIPTION, |
| - kOsWin | kOsLinux | kOsCrOS, |
| - SINGLE_VALUE_TYPE(extensions::switches::kDisableExtensionInfoDialog) |
| - }, |
| + {"disable-extension-info-dialog", |
| + IDS_FLAGS_DISABLE_EXTENSION_INFO_DIALOG_NAME, |
| + IDS_FLAGS_DISABLE_EXTENSION_INFO_DIALOG_DESCRIPTION, |
| + kOsWin | kOsLinux | kOsCrOS, |
| + SINGLE_VALUE_TYPE(extensions::switches::kDisableExtensionInfoDialog)}, |
| #endif |
| #if defined(OS_CHROMEOS) |
| - { |
| - "enable-virtual-keyboard", |
| - IDS_FLAGS_ENABLE_VIRTUAL_KEYBOARD_NAME, |
| - IDS_FLAGS_ENABLE_VIRTUAL_KEYBOARD_DESCRIPTION, |
| - kOsCrOS, |
| - SINGLE_VALUE_TYPE(keyboard::switches::kEnableVirtualKeyboard) |
| - }, |
| - { |
| - "enable-virtual-keyboard-overscroll", |
| - IDS_FLAGS_ENABLE_VIRTUAL_KEYBOARD_OVERSCROLL_NAME, |
| - IDS_FLAGS_ENABLE_VIRTUAL_KEYBOARD_OVERSCROLL_DESCRIPTION, |
| - kOsCrOS, |
| - ENABLE_DISABLE_VALUE_TYPE( |
| - keyboard::switches::kEnableVirtualKeyboardOverscroll, |
| - keyboard::switches::kDisableVirtualKeyboardOverscroll) |
| - }, |
| - { |
| - "enable-swipe-selection", |
| - IDS_FLAGS_ENABLE_SWIPE_SELECTION_NAME, |
| - IDS_FLAGS_ENABLE_SWIPE_SELECTION_DESCRIPTION, |
| - kOsCrOS, |
| - SINGLE_VALUE_TYPE(keyboard::switches::kEnableSwipeSelection) |
| - }, |
| - { |
| - "enable-input-view", |
| - IDS_FLAGS_ENABLE_INPUT_VIEW_NAME, |
| - IDS_FLAGS_ENABLE_INPUT_VIEW_DESCRIPTION, |
| - kOsCrOS, |
| - ENABLE_DISABLE_VALUE_TYPE(keyboard::switches::kEnableInputView, |
| - keyboard::switches::kDisableInputView) |
| - }, |
| - { |
| - "enable-new-korean-ime", |
| - IDS_FLAGS_ENABLE_NEW_KOREAN_IME_NAME, |
| - IDS_FLAGS_ENABLE_NEW_KOREAN_IME_DESCRIPTION, |
| - kOsCrOS, |
| - SINGLE_VALUE_TYPE(chromeos::switches::kEnableNewKoreanIme) |
| - }, |
| - { |
| - "enable-new-qp-input-view", |
| - IDS_FLAGS_ENABLE_NEW_QP_INPUT_VIEW_NAME, |
| - IDS_FLAGS_ENABLE_NEW_QP_INPUT_VIEW_DESCRIPTION, |
| - kOsCrOS, |
| - SINGLE_VALUE_TYPE(chromeos::switches::kEnableNewQPInputView) |
| - }, |
| - { |
| - "enable-physical-keyboard-autocorrect", |
| - IDS_FLAGS_ENABLE_PHYSICAL_KEYBOARD_AUTOCORRECT_NAME, |
| - IDS_FLAGS_ENABLE_PHYSICAL_KEYBOARD_AUTOCORRECT_DESCRIPTION, |
| - kOsCrOS, |
| - SINGLE_VALUE_TYPE(chromeos::switches::kEnablePhysicalKeyboardAutocorrect) |
| - }, |
| - { |
| - "enable-experimental-input-view-features", |
| - IDS_FLAGS_ENABLE_EXPERIMENTAL_INPUT_VIEW_FEATURES_NAME, |
| - IDS_FLAGS_ENABLE_EXPERIMENTAL_INPUT_VIEW_FEATURES_DESCRIPTION, |
| - kOsCrOS, |
| - SINGLE_VALUE_TYPE(keyboard::switches::kEnableExperimentalInputViewFeatures) |
| - }, |
| - { |
| - "disable-smart-virtual-keyboard", |
| - IDS_FLAGS_DISABLE_SMART_VIRTUAL_KEYBOARD_NAME, |
| - IDS_FLAGS_DISABLE_SMART_VIRTUAL_KEYBOARD_DESCRIPTION, |
| - kOsCrOS, |
| - SINGLE_VALUE_TYPE(keyboard::switches::kDisableSmartVirtualKeyboard) |
| - }, |
| -#endif |
| - { |
| - "enable-simple-cache-backend", |
| - IDS_FLAGS_ENABLE_SIMPLE_CACHE_BACKEND_NAME, |
| - IDS_FLAGS_ENABLE_SIMPLE_CACHE_BACKEND_DESCRIPTION, |
| - kOsWin | kOsMac | kOsLinux | kOsCrOS, |
| - MULTI_VALUE_TYPE(kSimpleCacheBackendChoices) |
| - }, |
| - { |
| - "enable-tcp-fast-open", |
| - IDS_FLAGS_ENABLE_TCP_FAST_OPEN_NAME, |
| - IDS_FLAGS_ENABLE_TCP_FAST_OPEN_DESCRIPTION, |
| - kOsLinux | kOsCrOS | kOsAndroid, |
| - SINGLE_VALUE_TYPE(switches::kEnableTcpFastOpen) |
| - }, |
| + {"enable-virtual-keyboard", |
| + IDS_FLAGS_ENABLE_VIRTUAL_KEYBOARD_NAME, |
| + IDS_FLAGS_ENABLE_VIRTUAL_KEYBOARD_DESCRIPTION, |
| + kOsCrOS, |
| + SINGLE_VALUE_TYPE(keyboard::switches::kEnableVirtualKeyboard)}, |
| + {"enable-virtual-keyboard-overscroll", |
| + IDS_FLAGS_ENABLE_VIRTUAL_KEYBOARD_OVERSCROLL_NAME, |
| + IDS_FLAGS_ENABLE_VIRTUAL_KEYBOARD_OVERSCROLL_DESCRIPTION, |
| + kOsCrOS, |
| + ENABLE_DISABLE_VALUE_TYPE( |
| + keyboard::switches::kEnableVirtualKeyboardOverscroll, |
| + keyboard::switches::kDisableVirtualKeyboardOverscroll)}, |
| + {"enable-swipe-selection", |
| + IDS_FLAGS_ENABLE_SWIPE_SELECTION_NAME, |
| + IDS_FLAGS_ENABLE_SWIPE_SELECTION_DESCRIPTION, |
| + kOsCrOS, |
| + SINGLE_VALUE_TYPE(keyboard::switches::kEnableSwipeSelection)}, |
| + {"enable-input-view", |
| + IDS_FLAGS_ENABLE_INPUT_VIEW_NAME, |
| + IDS_FLAGS_ENABLE_INPUT_VIEW_DESCRIPTION, |
| + kOsCrOS, |
| + ENABLE_DISABLE_VALUE_TYPE(keyboard::switches::kEnableInputView, |
| + keyboard::switches::kDisableInputView)}, |
| + {"enable-new-korean-ime", |
| + IDS_FLAGS_ENABLE_NEW_KOREAN_IME_NAME, |
| + IDS_FLAGS_ENABLE_NEW_KOREAN_IME_DESCRIPTION, |
| + kOsCrOS, |
| + SINGLE_VALUE_TYPE(chromeos::switches::kEnableNewKoreanIme)}, |
| + {"enable-new-qp-input-view", |
| + IDS_FLAGS_ENABLE_NEW_QP_INPUT_VIEW_NAME, |
| + IDS_FLAGS_ENABLE_NEW_QP_INPUT_VIEW_DESCRIPTION, |
| + kOsCrOS, |
| + SINGLE_VALUE_TYPE(chromeos::switches::kEnableNewQPInputView)}, |
| + {"enable-physical-keyboard-autocorrect", |
| + IDS_FLAGS_ENABLE_PHYSICAL_KEYBOARD_AUTOCORRECT_NAME, |
| + IDS_FLAGS_ENABLE_PHYSICAL_KEYBOARD_AUTOCORRECT_DESCRIPTION, |
| + kOsCrOS, |
| + SINGLE_VALUE_TYPE(chromeos::switches::kEnablePhysicalKeyboardAutocorrect)}, |
| + {"enable-experimental-input-view-features", |
| + IDS_FLAGS_ENABLE_EXPERIMENTAL_INPUT_VIEW_FEATURES_NAME, |
| + IDS_FLAGS_ENABLE_EXPERIMENTAL_INPUT_VIEW_FEATURES_DESCRIPTION, |
| + kOsCrOS, |
| + SINGLE_VALUE_TYPE( |
| + keyboard::switches::kEnableExperimentalInputViewFeatures)}, |
| + {"disable-smart-virtual-keyboard", |
| + IDS_FLAGS_DISABLE_SMART_VIRTUAL_KEYBOARD_NAME, |
| + IDS_FLAGS_DISABLE_SMART_VIRTUAL_KEYBOARD_DESCRIPTION, |
| + kOsCrOS, |
| + SINGLE_VALUE_TYPE(keyboard::switches::kDisableSmartVirtualKeyboard)}, |
| +#endif |
| + {"enable-simple-cache-backend", |
| + IDS_FLAGS_ENABLE_SIMPLE_CACHE_BACKEND_NAME, |
| + IDS_FLAGS_ENABLE_SIMPLE_CACHE_BACKEND_DESCRIPTION, |
| + kOsWin | kOsMac | kOsLinux | kOsCrOS, |
| + MULTI_VALUE_TYPE(kSimpleCacheBackendChoices)}, |
| + {"enable-tcp-fast-open", |
| + IDS_FLAGS_ENABLE_TCP_FAST_OPEN_NAME, |
| + IDS_FLAGS_ENABLE_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, |
| - ENABLE_DISABLE_VALUE_TYPE(switches::kEnableDeviceDiscoveryNotifications, |
| - switches::kDisableDeviceDiscoveryNotifications) |
| - }, |
| - { |
| - "enable-cloud-devices", |
| - IDS_FLAGS_ENABLE_CLOUD_DEVICES_NAME, |
| - IDS_FLAGS_ENABLE_CLOUD_DEVICES_DESCRIPTION, |
| - kOsDesktop, |
| - SINGLE_VALUE_TYPE(switches::kEnableCloudDevices) |
| - }, |
| - { |
| - "enable-print-preview-register-promos", |
| - IDS_FLAGS_ENABLE_PRINT_PREVIEW_REGISTER_PROMOS_NAME, |
| - IDS_FLAGS_ENABLE_PRINT_PREVIEW_REGISTER_PROMOS_DESCRIPTION, |
| - kOsDesktop, |
| - SINGLE_VALUE_TYPE(switches::kEnablePrintPreviewRegisterPromos) |
| - }, |
| + {"device-discovery-notifications", |
| + IDS_FLAGS_DEVICE_DISCOVERY_NOTIFICATIONS_NAME, |
| + IDS_FLAGS_DEVICE_DISCOVERY_NOTIFICATIONS_DESCRIPTION, |
| + kOsDesktop, |
| + ENABLE_DISABLE_VALUE_TYPE(switches::kEnableDeviceDiscoveryNotifications, |
| + switches::kDisableDeviceDiscoveryNotifications)}, |
| + {"enable-cloud-devices", |
| + IDS_FLAGS_ENABLE_CLOUD_DEVICES_NAME, |
| + IDS_FLAGS_ENABLE_CLOUD_DEVICES_DESCRIPTION, |
| + kOsDesktop, |
| + SINGLE_VALUE_TYPE(switches::kEnableCloudDevices)}, |
| + {"enable-print-preview-register-promos", |
| + IDS_FLAGS_ENABLE_PRINT_PREVIEW_REGISTER_PROMOS_NAME, |
| + IDS_FLAGS_ENABLE_PRINT_PREVIEW_REGISTER_PROMOS_DESCRIPTION, |
| + kOsDesktop, |
| + SINGLE_VALUE_TYPE(switches::kEnablePrintPreviewRegisterPromos)}, |
| #endif // ENABLE_SERVICE_DISCOVERY |
| #if defined(OS_WIN) |
| - { |
| - "enable-cloud-print-xps", |
| - IDS_FLAGS_ENABLE_CLOUD_PRINT_XPS_NAME, |
| - IDS_FLAGS_ENABLE_CLOUD_PRINT_XPS_DESCRIPTION, |
| - kOsWin, |
| - SINGLE_VALUE_TYPE(switches::kEnableCloudPrintXps) |
| - }, |
| + {"enable-cloud-print-xps", |
| + IDS_FLAGS_ENABLE_CLOUD_PRINT_XPS_NAME, |
| + IDS_FLAGS_ENABLE_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, |
| - MULTI_VALUE_TYPE(kTabCaptureUpscaleQualityChoices) |
| - }, |
| - { |
| - "tab-capture-downscale-quality", |
| - IDS_FLAGS_TAB_CAPTURE_DOWNSCALE_QUALITY_NAME, |
| - IDS_FLAGS_TAB_CAPTURE_DOWNSCALE_QUALITY_DESCRIPTION, |
| - kOsAll, |
| - MULTI_VALUE_TYPE(kTabCaptureDownscaleQualityChoices) |
| - }, |
| + {"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, |
| + MULTI_VALUE_TYPE(kTabCaptureDownscaleQualityChoices)}, |
| #endif |
| #if defined(ENABLE_SPELLCHECK) |
| - { |
| - "enable-spelling-feedback-field-trial", |
| - IDS_FLAGS_ENABLE_SPELLING_FEEDBACK_FIELD_TRIAL_NAME, |
| - IDS_FLAGS_ENABLE_SPELLING_FEEDBACK_FIELD_TRIAL_DESCRIPTION, |
| - kOsAll, |
| - SINGLE_VALUE_TYPE(switches::kEnableSpellingFeedbackFieldTrial) |
| - }, |
| -#endif |
| - { |
| - "enable-webgl-draft-extensions", |
| - IDS_FLAGS_ENABLE_WEBGL_DRAFT_EXTENSIONS_NAME, |
| - IDS_FLAGS_ENABLE_WEBGL_DRAFT_EXTENSIONS_DESCRIPTION, |
| - kOsAll, |
| - SINGLE_VALUE_TYPE(switches::kEnableWebGLDraftExtensions) |
| - }, |
| - { |
| - "enable-web-midi", |
| - IDS_FLAGS_ENABLE_WEB_MIDI_NAME, |
| - IDS_FLAGS_ENABLE_WEB_MIDI_DESCRIPTION, |
| - kOsMac | kOsWin | kOsLinux | kOsCrOS | kOsAndroid, |
| - SINGLE_VALUE_TYPE(switches::kEnableWebMIDI) |
| - }, |
| - { |
| - "enable-new-profile-management", |
| - IDS_FLAGS_ENABLE_NEW_PROFILE_MANAGEMENT_NAME, |
| - IDS_FLAGS_ENABLE_NEW_PROFILE_MANAGEMENT_DESCRIPTION, |
| - kOsAndroid | kOsMac | kOsWin | kOsLinux | kOsCrOS, |
| - ENABLE_DISABLE_VALUE_TYPE(switches::kEnableNewProfileManagement, |
| - switches::kDisableNewProfileManagement) |
| - }, |
| - { |
| - "enable-account-consistency", |
| - IDS_FLAGS_ENABLE_ACCOUNT_CONSISTENCY_NAME, |
| - IDS_FLAGS_ENABLE_ACCOUNT_CONSISTENCY_DESCRIPTION, |
| - kOsAndroid | kOsMac | kOsWin | kOsLinux | kOsCrOS, |
| - ENABLE_DISABLE_VALUE_TYPE(switches::kEnableAccountConsistency, |
| - switches::kDisableAccountConsistency) |
| - }, |
| - { |
| - "enable-fast-user-switching", |
| - IDS_FLAGS_ENABLE_FAST_USER_SWITCHING_NAME, |
| - IDS_FLAGS_ENABLE_FAST_USER_SWITCHING_DESCRIPTION, |
| - kOsMac | kOsWin | kOsLinux, |
| - SINGLE_VALUE_TYPE(switches::kFastUserSwitching) |
| - }, |
| - { |
| - "enable-new-avatar-menu", |
| - IDS_FLAGS_ENABLE_NEW_AVATAR_MENU_NAME, |
| - IDS_FLAGS_ENABLE_NEW_AVATAR_MENU_DESCRIPTION, |
| - kOsMac | kOsWin | kOsLinux, |
| - ENABLE_DISABLE_VALUE_TYPE(switches::kEnableNewAvatarMenu, |
| - switches::kDisableNewAvatarMenu) |
| - }, |
| - { |
| - "enable-web-based-signin", |
| - IDS_FLAGS_ENABLE_WEB_BASED_SIGNIN_NAME, |
| - IDS_FLAGS_ENABLE_WEB_BASED_SIGNIN_DESCRIPTION, |
| - kOsMac | kOsWin | kOsLinux, |
| - SINGLE_VALUE_TYPE(switches::kEnableWebBasedSignin) |
| - }, |
| - { |
| - "enable-webview-based-signin", |
| - IDS_FLAGS_ENABLE_WEBVIEW_BASED_SIGNIN_NAME, |
| - IDS_FLAGS_ENABLE_WEBVIEW_BASED_SIGNIN_DESCRIPTION, |
| - kOsMac | kOsWin | kOsLinux, |
| - SINGLE_VALUE_TYPE(switches::kEnableWebviewBasedSignin) |
| - }, |
| - { |
| - "enable-google-profile-info", |
| - IDS_FLAGS_ENABLE_GOOGLE_PROFILE_INFO_NAME, |
| - IDS_FLAGS_ENABLE_GOOGLE_PROFILE_INFO_DESCRIPTION, |
| - kOsMac | kOsWin | kOsLinux, |
| - SINGLE_VALUE_TYPE(switches::kGoogleProfileInfo) |
| - }, |
| - { |
| - "reset-app-list-install-state", |
| - IDS_FLAGS_RESET_APP_LIST_INSTALL_STATE_NAME, |
| - IDS_FLAGS_RESET_APP_LIST_INSTALL_STATE_DESCRIPTION, |
| - kOsMac | kOsWin | kOsLinux, |
| - SINGLE_VALUE_TYPE(switches::kResetAppListInstallState) |
| - }, |
| + {"enable-spelling-feedback-field-trial", |
| + IDS_FLAGS_ENABLE_SPELLING_FEEDBACK_FIELD_TRIAL_NAME, |
| + IDS_FLAGS_ENABLE_SPELLING_FEEDBACK_FIELD_TRIAL_DESCRIPTION, |
| + kOsAll, |
| + SINGLE_VALUE_TYPE(switches::kEnableSpellingFeedbackFieldTrial)}, |
| +#endif |
| + {"enable-webgl-draft-extensions", |
| + IDS_FLAGS_ENABLE_WEBGL_DRAFT_EXTENSIONS_NAME, |
| + IDS_FLAGS_ENABLE_WEBGL_DRAFT_EXTENSIONS_DESCRIPTION, |
| + kOsAll, |
| + SINGLE_VALUE_TYPE(switches::kEnableWebGLDraftExtensions)}, |
| + {"enable-web-midi", |
| + IDS_FLAGS_ENABLE_WEB_MIDI_NAME, |
| + IDS_FLAGS_ENABLE_WEB_MIDI_DESCRIPTION, |
| + kOsMac | kOsWin | kOsLinux | kOsCrOS | kOsAndroid, |
| + SINGLE_VALUE_TYPE(switches::kEnableWebMIDI)}, |
| + {"enable-new-profile-management", |
| + IDS_FLAGS_ENABLE_NEW_PROFILE_MANAGEMENT_NAME, |
| + IDS_FLAGS_ENABLE_NEW_PROFILE_MANAGEMENT_DESCRIPTION, |
| + kOsAndroid | kOsMac | kOsWin | kOsLinux | kOsCrOS, |
| + ENABLE_DISABLE_VALUE_TYPE(switches::kEnableNewProfileManagement, |
| + switches::kDisableNewProfileManagement)}, |
| + {"enable-account-consistency", |
| + IDS_FLAGS_ENABLE_ACCOUNT_CONSISTENCY_NAME, |
| + IDS_FLAGS_ENABLE_ACCOUNT_CONSISTENCY_DESCRIPTION, |
| + kOsAndroid | kOsMac | kOsWin | kOsLinux | kOsCrOS, |
| + ENABLE_DISABLE_VALUE_TYPE(switches::kEnableAccountConsistency, |
| + switches::kDisableAccountConsistency)}, |
| + {"enable-fast-user-switching", |
| + IDS_FLAGS_ENABLE_FAST_USER_SWITCHING_NAME, |
| + IDS_FLAGS_ENABLE_FAST_USER_SWITCHING_DESCRIPTION, |
| + kOsMac | kOsWin | kOsLinux, |
| + SINGLE_VALUE_TYPE(switches::kFastUserSwitching)}, |
| + {"enable-new-avatar-menu", |
| + IDS_FLAGS_ENABLE_NEW_AVATAR_MENU_NAME, |
| + IDS_FLAGS_ENABLE_NEW_AVATAR_MENU_DESCRIPTION, |
| + kOsMac | kOsWin | kOsLinux, |
| + ENABLE_DISABLE_VALUE_TYPE(switches::kEnableNewAvatarMenu, |
| + switches::kDisableNewAvatarMenu)}, |
| + {"enable-web-based-signin", |
| + IDS_FLAGS_ENABLE_WEB_BASED_SIGNIN_NAME, |
| + IDS_FLAGS_ENABLE_WEB_BASED_SIGNIN_DESCRIPTION, |
| + kOsMac | kOsWin | kOsLinux, |
| + SINGLE_VALUE_TYPE(switches::kEnableWebBasedSignin)}, |
| + {"enable-webview-based-signin", |
| + IDS_FLAGS_ENABLE_WEBVIEW_BASED_SIGNIN_NAME, |
| + IDS_FLAGS_ENABLE_WEBVIEW_BASED_SIGNIN_DESCRIPTION, |
| + kOsMac | kOsWin | kOsLinux, |
| + SINGLE_VALUE_TYPE(switches::kEnableWebviewBasedSignin)}, |
| + {"enable-google-profile-info", |
| + IDS_FLAGS_ENABLE_GOOGLE_PROFILE_INFO_NAME, |
| + IDS_FLAGS_ENABLE_GOOGLE_PROFILE_INFO_DESCRIPTION, |
| + kOsMac | kOsWin | kOsLinux, |
| + SINGLE_VALUE_TYPE(switches::kGoogleProfileInfo)}, |
| + {"reset-app-list-install-state", |
| + IDS_FLAGS_RESET_APP_LIST_INSTALL_STATE_NAME, |
| + IDS_FLAGS_RESET_APP_LIST_INSTALL_STATE_DESCRIPTION, |
| + kOsMac | kOsWin | kOsLinux, |
| + SINGLE_VALUE_TYPE(switches::kResetAppListInstallState)}, |
| #if defined(ENABLE_APP_LIST) |
| #if defined(OS_LINUX) |
| - { |
| - // This is compiled out on non-Linux platforms because otherwise it would be |
| - // visible on Win/Mac/CrOS but not on Linux GTK, which would be confusing. |
| - // TODO(mgiuca): Remove the #if when Aura is the default on Linux. |
| - "enable-app-list", |
| - IDS_FLAGS_ENABLE_APP_LIST_NAME, |
| - IDS_FLAGS_ENABLE_APP_LIST_DESCRIPTION, |
| - kOsLinux, |
| - SINGLE_VALUE_TYPE(switches::kEnableAppList) |
| - }, |
| + {// This is compiled out on non-Linux platforms because otherwise it would |
| + // be |
| + // visible on Win/Mac/CrOS but not on Linux GTK, which would be confusing. |
| + // TODO(mgiuca): Remove the #if when Aura is the default on Linux. |
| + "enable-app-list", |
| + IDS_FLAGS_ENABLE_APP_LIST_NAME, |
| + IDS_FLAGS_ENABLE_APP_LIST_DESCRIPTION, |
| + kOsLinux, |
| + SINGLE_VALUE_TYPE(switches::kEnableAppList)}, |
| #endif |
| #if defined(ENABLE_EXTENSIONS) |
| - { |
| - "enable-surface-worker", |
| - IDS_FLAGS_ENABLE_SURFACE_WORKER_NAME, |
| - IDS_FLAGS_ENABLE_SURFACE_WORKER_DESCRIPTION, |
| - kOsDesktop, |
| - SINGLE_VALUE_TYPE(extensions::switches::kEnableSurfaceWorker) |
| - }, |
| -#endif |
| - { |
| - "disable-app-list-app-info", |
| - IDS_FLAGS_DISABLE_APP_INFO_IN_APP_LIST, |
| - IDS_FLAGS_DISABLE_APP_INFO_IN_APP_LIST_DESCRIPTION, |
| - kOsLinux | kOsWin | kOsCrOS, |
| - SINGLE_VALUE_TYPE(app_list::switches::kDisableAppInfo) |
| - }, |
| - { |
| - "disable-drive-apps-in-app-list", |
| - IDS_FLAGS_DISABLE_DRIVE_APPS_IN_APP_LIST_NAME, |
| - IDS_FLAGS_DISABLE_DRIVE_APPS_IN_APP_LIST_DESCRIPTION, |
| - kOsCrOS, |
| - SINGLE_VALUE_TYPE(app_list::switches::kDisableDriveAppsInAppList) |
| - }, |
| + {"enable-surface-worker", |
| + IDS_FLAGS_ENABLE_SURFACE_WORKER_NAME, |
| + IDS_FLAGS_ENABLE_SURFACE_WORKER_DESCRIPTION, |
| + kOsDesktop, |
| + SINGLE_VALUE_TYPE(extensions::switches::kEnableSurfaceWorker)}, |
| +#endif |
| + {"disable-app-list-app-info", |
| + IDS_FLAGS_DISABLE_APP_INFO_IN_APP_LIST, |
| + IDS_FLAGS_DISABLE_APP_INFO_IN_APP_LIST_DESCRIPTION, |
| + kOsLinux | kOsWin | kOsCrOS, |
| + SINGLE_VALUE_TYPE(app_list::switches::kDisableAppInfo)}, |
| + {"disable-drive-apps-in-app-list", |
| + IDS_FLAGS_DISABLE_DRIVE_APPS_IN_APP_LIST_NAME, |
| + IDS_FLAGS_DISABLE_DRIVE_APPS_IN_APP_LIST_DESCRIPTION, |
| + kOsCrOS, |
| + SINGLE_VALUE_TYPE(app_list::switches::kDisableDriveAppsInAppList)}, |
| #endif |
| #if defined(OS_ANDROID) |
| - { |
| - "enable-accessibility-tab-switcher", |
| - IDS_FLAGS_ENABLE_ACCESSIBILITY_TAB_SWITCHER_NAME, |
| - IDS_FLAGS_ENABLE_ACCESSIBILITY_TAB_SWITCHER_DESCRIPTION, |
| - kOsAndroid, |
| - SINGLE_VALUE_TYPE(switches::kEnableAccessibilityTabSwitcher) |
| - }, |
| - { |
| - // TODO(dmazzoni): remove this flag when native android accessibility |
| - // ships in the stable channel. http://crbug.com/356775 |
| - "enable-accessibility-script-injection", |
| - IDS_FLAGS_ENABLE_ACCESSIBILITY_SCRIPT_INJECTION_NAME, |
| - IDS_FLAGS_ENABLE_ACCESSIBILITY_SCRIPT_INJECTION_DESCRIPTION, |
| - kOsAndroid, |
| - // Java-only switch: ContentSwitches.ENABLE_ACCESSIBILITY_SCRIPT_INJECTION. |
| - SINGLE_VALUE_TYPE("enable-accessibility-script-injection") |
| - }, |
| -#endif |
| - { |
| - "enable-one-copy", |
| - IDS_FLAGS_ONE_COPY_NAME, |
| - IDS_FLAGS_ONE_COPY_DESCRIPTION, |
| - kOsAll, |
| - ENABLE_DISABLE_VALUE_TYPE(switches::kEnableOneCopy, |
| - switches::kDisableOneCopy) |
| - }, |
| - { |
| - "enable-zero-copy", |
| - IDS_FLAGS_ZERO_COPY_NAME, |
| - IDS_FLAGS_ZERO_COPY_DESCRIPTION, |
| - kOsAll, |
| - SINGLE_VALUE_TYPE(switches::kEnableZeroCopy) |
| - }, |
| + {"enable-accessibility-tab-switcher", |
| + IDS_FLAGS_ENABLE_ACCESSIBILITY_TAB_SWITCHER_NAME, |
| + IDS_FLAGS_ENABLE_ACCESSIBILITY_TAB_SWITCHER_DESCRIPTION, |
| + kOsAndroid, |
| + SINGLE_VALUE_TYPE(switches::kEnableAccessibilityTabSwitcher)}, |
| + {// TODO(dmazzoni): remove this flag when native android accessibility |
| + // ships in the stable channel. http://crbug.com/356775 |
| + "enable-accessibility-script-injection", |
| + IDS_FLAGS_ENABLE_ACCESSIBILITY_SCRIPT_INJECTION_NAME, |
| + IDS_FLAGS_ENABLE_ACCESSIBILITY_SCRIPT_INJECTION_DESCRIPTION, |
| + kOsAndroid, |
| + // Java-only switch: ContentSwitches.ENABLE_ACCESSIBILITY_SCRIPT_INJECTION. |
| + SINGLE_VALUE_TYPE("enable-accessibility-script-injection")}, |
| +#endif |
| + {"enable-one-copy", |
| + IDS_FLAGS_ONE_COPY_NAME, |
| + IDS_FLAGS_ONE_COPY_DESCRIPTION, |
| + kOsAll, |
| + ENABLE_DISABLE_VALUE_TYPE(switches::kEnableOneCopy, |
| + switches::kDisableOneCopy)}, |
| + {"enable-zero-copy", |
| + IDS_FLAGS_ZERO_COPY_NAME, |
| + IDS_FLAGS_ZERO_COPY_DESCRIPTION, |
| + kOsAll, |
| + SINGLE_VALUE_TYPE(switches::kEnableZeroCopy)}, |
| #if defined(OS_CHROMEOS) |
| - { |
| - "enable-first-run-ui-transitions", |
| - IDS_FLAGS_ENABLE_FIRST_RUN_UI_TRANSITIONS_NAME, |
| - IDS_FLAGS_ENABLE_FIRST_RUN_UI_TRANSITIONS_DESCRIPTION, |
| - kOsCrOS, |
| - SINGLE_VALUE_TYPE(chromeos::switches::kEnableFirstRunUITransitions) |
| - }, |
| -#endif |
| - { |
| - "disable-new-bookmark-apps", |
| - IDS_FLAGS_DISABLE_NEW_BOOKMARK_APPS_NAME, |
| - IDS_FLAGS_DISABLE_NEW_BOOKMARK_APPS_DESCRIPTION, |
| - kOsWin | kOsCrOS | kOsLinux | kOsMac, |
| - SINGLE_VALUE_TYPE(switches::kDisableNewBookmarkApps) |
| - }, |
| + {"enable-first-run-ui-transitions", |
| + IDS_FLAGS_ENABLE_FIRST_RUN_UI_TRANSITIONS_NAME, |
| + IDS_FLAGS_ENABLE_FIRST_RUN_UI_TRANSITIONS_DESCRIPTION, |
| + kOsCrOS, |
| + SINGLE_VALUE_TYPE(chromeos::switches::kEnableFirstRunUITransitions)}, |
| +#endif |
| + {"disable-new-bookmark-apps", |
| + IDS_FLAGS_DISABLE_NEW_BOOKMARK_APPS_NAME, |
| + IDS_FLAGS_DISABLE_NEW_BOOKMARK_APPS_DESCRIPTION, |
| + kOsWin | kOsCrOS | kOsLinux | kOsMac, |
| + SINGLE_VALUE_TYPE(switches::kDisableNewBookmarkApps)}, |
| #if defined(OS_MACOSX) |
| - { |
| - "enable-hosted-app-shim-creation", |
| - IDS_FLAGS_ENABLE_HOSTED_APP_SHIM_CREATION_NAME, |
| - IDS_FLAGS_ENABLE_HOSTED_APP_SHIM_CREATION_DESCRIPTION, |
| - kOsMac, |
| - SINGLE_VALUE_TYPE(switches::kEnableHostedAppShimCreation) |
| - }, |
| - { |
| - "enable-hosted-app-quit-notification", |
| - IDS_FLAGS_ENABLE_HOSTED_APP_QUIT_NOTIFICATION_NAME, |
| - IDS_FLAGS_ENABLE_HOSTED_APP_QUIT_NOTIFICATION_DESCRIPTION, |
| - kOsMac, |
| - SINGLE_VALUE_TYPE(switches::kHostedAppQuitNotification) |
| - }, |
| -#endif |
| - { |
| - "enable-ephemeral-apps-in-webstore", |
| - IDS_FLAGS_ENABLE_EPHEMERAL_APPS_IN_WEBSTORE_NAME, |
| - IDS_FLAGS_ENABLE_EPHEMERAL_APPS_IN_WEBSTORE_DESCRIPTION, |
| - kOsAll, |
| - SINGLE_VALUE_TYPE(switches::kEnableEphemeralAppsInWebstore) |
| - }, |
| - { |
| - "enable-linkable-ephemeral-apps", |
| - IDS_FLAGS_ENABLE_LINKABLE_EPHEMERAL_APPS_NAME, |
| - IDS_FLAGS_ENABLE_LINKABLE_EPHEMERAL_APPS_DESCRIPTION, |
| - kOsAll, |
| - SINGLE_VALUE_TYPE(switches::kEnableLinkableEphemeralApps) |
| - }, |
| - { |
| - "enable-service-worker-sync", |
| - IDS_FLAGS_ENABLE_SERVICE_WORKER_SYNC_NAME, |
| - IDS_FLAGS_ENABLE_SERVICE_WORKER_SYNC_DESCRIPTION, |
| - kOsAll, |
| - SINGLE_VALUE_TYPE(switches::kEnableServiceWorkerSync) |
| - }, |
| + {"enable-hosted-app-shim-creation", |
| + IDS_FLAGS_ENABLE_HOSTED_APP_SHIM_CREATION_NAME, |
| + IDS_FLAGS_ENABLE_HOSTED_APP_SHIM_CREATION_DESCRIPTION, |
| + kOsMac, |
| + SINGLE_VALUE_TYPE(switches::kEnableHostedAppShimCreation)}, |
| + {"enable-hosted-app-quit-notification", |
| + IDS_FLAGS_ENABLE_HOSTED_APP_QUIT_NOTIFICATION_NAME, |
| + IDS_FLAGS_ENABLE_HOSTED_APP_QUIT_NOTIFICATION_DESCRIPTION, |
| + kOsMac, |
| + SINGLE_VALUE_TYPE(switches::kHostedAppQuitNotification)}, |
| +#endif |
| + {"enable-ephemeral-apps-in-webstore", |
| + IDS_FLAGS_ENABLE_EPHEMERAL_APPS_IN_WEBSTORE_NAME, |
| + IDS_FLAGS_ENABLE_EPHEMERAL_APPS_IN_WEBSTORE_DESCRIPTION, |
| + kOsAll, |
| + SINGLE_VALUE_TYPE(switches::kEnableEphemeralAppsInWebstore)}, |
| + {"enable-linkable-ephemeral-apps", |
| + IDS_FLAGS_ENABLE_LINKABLE_EPHEMERAL_APPS_NAME, |
| + IDS_FLAGS_ENABLE_LINKABLE_EPHEMERAL_APPS_DESCRIPTION, |
| + kOsAll, |
| + SINGLE_VALUE_TYPE(switches::kEnableLinkableEphemeralApps)}, |
| + {"enable-service-worker-sync", |
| + IDS_FLAGS_ENABLE_SERVICE_WORKER_SYNC_NAME, |
| + IDS_FLAGS_ENABLE_SERVICE_WORKER_SYNC_DESCRIPTION, |
| + kOsAll, |
| + SINGLE_VALUE_TYPE(switches::kEnableServiceWorkerSync)}, |
| #if defined(OS_ANDROID) |
| - { |
| - "disable-click-delay", |
| - IDS_FLAGS_DISABLE_CLICK_DELAY_NAME, |
| - IDS_FLAGS_DISABLE_CLICK_DELAY_DESCRIPTION, |
| - kOsAndroid, |
| - // Java-only switch: CommandLine.DISABLE_CLICK_DELAY |
| - SINGLE_VALUE_TYPE("disable-click-delay") |
| - }, |
| - { |
| - "disable-pull-to-refresh-effect", |
| - IDS_FLAGS_DISABLE_PULL_TO_REFRESH_EFFECT_NAME, |
| - IDS_FLAGS_DISABLE_PULL_TO_REFRESH_EFFECT_DESCRIPTION, |
| - kOsAndroid, |
| - SINGLE_VALUE_TYPE(switches::kDisablePullToRefreshEffect) |
| - }, |
| + {"disable-click-delay", |
| + IDS_FLAGS_DISABLE_CLICK_DELAY_NAME, |
| + IDS_FLAGS_DISABLE_CLICK_DELAY_DESCRIPTION, |
| + kOsAndroid, |
| + // Java-only switch: CommandLine.DISABLE_CLICK_DELAY |
| + SINGLE_VALUE_TYPE("disable-click-delay")}, |
| + {"disable-pull-to-refresh-effect", |
| + IDS_FLAGS_DISABLE_PULL_TO_REFRESH_EFFECT_NAME, |
| + IDS_FLAGS_DISABLE_PULL_TO_REFRESH_EFFECT_DESCRIPTION, |
| + kOsAndroid, |
| + SINGLE_VALUE_TYPE(switches::kDisablePullToRefreshEffect)}, |
| #endif |
| #if defined(OS_MACOSX) |
| - { |
| - "enable-translate-new-ux", |
| - IDS_FLAGS_ENABLE_TRANSLATE_NEW_UX_NAME, |
| - IDS_FLAGS_ENABLE_TRANSLATE_NEW_UX_DESCRIPTION, |
| - kOsMac, |
| - SINGLE_VALUE_TYPE(switches::kEnableTranslateNewUX) |
| - }, |
| + {"enable-translate-new-ux", |
| + IDS_FLAGS_ENABLE_TRANSLATE_NEW_UX_NAME, |
| + IDS_FLAGS_ENABLE_TRANSLATE_NEW_UX_DESCRIPTION, |
| + kOsMac, |
| + SINGLE_VALUE_TYPE(switches::kEnableTranslateNewUX)}, |
| #endif |
| #if defined(TOOLKIT_VIEWS) |
| - { |
| - "disable-views-rect-based-targeting", // FLAGS:RECORD_UMA |
| - IDS_FLAGS_DISABLE_VIEWS_RECT_BASED_TARGETING_NAME, |
| - IDS_FLAGS_DISABLE_VIEWS_RECT_BASED_TARGETING_DESCRIPTION, |
| - kOsCrOS | kOsWin | kOsLinux, |
| - SINGLE_VALUE_TYPE(views::switches::kDisableViewsRectBasedTargeting) |
| - }, |
| - { |
| - "enable-link-disambiguation-popup", |
| - IDS_FLAGS_ENABLE_LINK_DISAMBIGUATION_POPUP_NAME, |
| - IDS_FLAGS_ENABLE_LINK_DISAMBIGUATION_POPUP_DESCRIPTION, |
| - kOsCrOS | kOsWin, |
| - SINGLE_VALUE_TYPE(switches::kEnableLinkDisambiguationPopup) |
| - }, |
| + {"disable-views-rect-based-targeting", // FLAGS:RECORD_UMA |
| + IDS_FLAGS_DISABLE_VIEWS_RECT_BASED_TARGETING_NAME, |
| + IDS_FLAGS_DISABLE_VIEWS_RECT_BASED_TARGETING_DESCRIPTION, |
| + kOsCrOS | kOsWin | kOsLinux, |
| + SINGLE_VALUE_TYPE(views::switches::kDisableViewsRectBasedTargeting)}, |
| + {"enable-link-disambiguation-popup", |
| + IDS_FLAGS_ENABLE_LINK_DISAMBIGUATION_POPUP_NAME, |
| + IDS_FLAGS_ENABLE_LINK_DISAMBIGUATION_POPUP_DESCRIPTION, |
| + kOsCrOS | kOsWin, |
| + SINGLE_VALUE_TYPE(switches::kEnableLinkDisambiguationPopup)}, |
| #endif |
| #if defined(ENABLE_EXTENSIONS) |
| - { |
| - "enable-apps-show-on-first-paint", |
| - IDS_FLAGS_ENABLE_APPS_SHOW_ON_FIRST_PAINT_NAME, |
| - IDS_FLAGS_ENABLE_APPS_SHOW_ON_FIRST_PAINT_DESCRIPTION, |
| - kOsDesktop, |
| - SINGLE_VALUE_TYPE(extensions::switches::kEnableAppsShowOnFirstPaint) |
| - }, |
| -#endif |
| - { |
| - "enhanced-bookmarks-experiment", |
| - IDS_FLAGS_ENABLE_ENHANCED_BOOKMARKS_NAME, |
| - IDS_FLAGS_ENABLE_ENHANCED_BOOKMARKS_DESCRIPTION, |
| - kOsDesktop | kOsAndroid, |
| - ENABLE_DISABLE_VALUE_TYPE_AND_VALUE( |
| - switches::kEnhancedBookmarksExperiment, "1", |
| - switches::kEnhancedBookmarksExperiment, "0") |
| - }, |
| - { |
| - "manual-enhanced-bookmarks", |
| - IDS_FLAGS_ENABLE_ENHANCED_BOOKMARKS_NAME, |
| - IDS_FLAGS_ENABLE_ENHANCED_BOOKMARKS_DESCRIPTION, |
| - kOsDesktop | kOsAndroid, |
| - SINGLE_VALUE_TYPE(switches::kManualEnhancedBookmarks) |
| - }, |
| - { |
| - "manual-enhanced-bookmarks-optout", |
| - IDS_FLAGS_ENABLE_ENHANCED_BOOKMARKS_NAME, |
| - IDS_FLAGS_ENABLE_ENHANCED_BOOKMARKS_DESCRIPTION, |
| - kOsDesktop | kOsAndroid, |
| - SINGLE_VALUE_TYPE(switches::kManualEnhancedBookmarksOptout) |
| - }, |
| + {"enable-apps-show-on-first-paint", |
| + IDS_FLAGS_ENABLE_APPS_SHOW_ON_FIRST_PAINT_NAME, |
| + IDS_FLAGS_ENABLE_APPS_SHOW_ON_FIRST_PAINT_DESCRIPTION, |
| + kOsDesktop, |
| + SINGLE_VALUE_TYPE(extensions::switches::kEnableAppsShowOnFirstPaint)}, |
| +#endif |
| + {"enhanced-bookmarks-experiment", |
| + IDS_FLAGS_ENABLE_ENHANCED_BOOKMARKS_NAME, |
| + IDS_FLAGS_ENABLE_ENHANCED_BOOKMARKS_DESCRIPTION, |
| + kOsDesktop | kOsAndroid, |
| + ENABLE_DISABLE_VALUE_TYPE_AND_VALUE(switches::kEnhancedBookmarksExperiment, |
| + "1", |
| + switches::kEnhancedBookmarksExperiment, |
| + "0")}, |
| + {"manual-enhanced-bookmarks", |
| + IDS_FLAGS_ENABLE_ENHANCED_BOOKMARKS_NAME, |
| + IDS_FLAGS_ENABLE_ENHANCED_BOOKMARKS_DESCRIPTION, |
| + kOsDesktop | kOsAndroid, |
| + SINGLE_VALUE_TYPE(switches::kManualEnhancedBookmarks)}, |
| + {"manual-enhanced-bookmarks-optout", |
| + IDS_FLAGS_ENABLE_ENHANCED_BOOKMARKS_NAME, |
| + IDS_FLAGS_ENABLE_ENHANCED_BOOKMARKS_DESCRIPTION, |
| + kOsDesktop | kOsAndroid, |
| + SINGLE_VALUE_TYPE(switches::kManualEnhancedBookmarksOptout)}, |
| #if defined(OS_ANDROID) |
| - { |
| - "enable-zero-suggest-experiment", |
| - IDS_FLAGS_ZERO_SUGGEST_EXPERIMENT_NAME, |
| - IDS_FLAGS_ZERO_SUGGEST_EXPERIMENT_DESCRIPTION, |
| - kOsAndroid, |
| - MULTI_VALUE_TYPE(kZeroSuggestExperimentsChoices) |
| - }, |
| - { |
| - "enable-reader-mode-toolbar-icon", |
| - IDS_FLAGS_READER_MODE_EXPERIMENT_NAME, |
| - IDS_FLAGS_READER_MODE_EXPERIMENT_DESCRIPTION, |
| - kOsAndroid, |
| - SINGLE_VALUE_TYPE(switches::kEnableReaderModeToolbarIcon) |
| - }, |
| -#endif |
| - { |
| - "num-raster-threads", |
| - IDS_FLAGS_NUM_RASTER_THREADS_NAME, |
| - IDS_FLAGS_NUM_RASTER_THREADS_DESCRIPTION, |
| - kOsAll, |
| - MULTI_VALUE_TYPE(kNumRasterThreadsChoices) |
| - }, |
| - { |
| - "origin-chip-in-omnibox", |
| - IDS_FLAGS_ORIGIN_CHIP_NAME, |
| - IDS_FLAGS_ORIGIN_CHIP_DESCRIPTION, |
| - kOsCrOS | kOsMac | kOsWin | kOsLinux, |
| - MULTI_VALUE_TYPE(kOriginChipChoices) |
| - }, |
| - { |
| - "search-button-in-omnibox", |
| - IDS_FLAGS_SEARCH_BUTTON_IN_OMNIBOX_NAME, |
| - IDS_FLAGS_SEARCH_BUTTON_IN_OMNIBOX_DESCRIPTION, |
| - kOsCrOS | kOsMac | kOsWin | kOsLinux, |
| - MULTI_VALUE_TYPE(kSearchButtonInOmniboxChoices) |
| - }, |
| - { |
| - "ignore-autocomplete-off-autofill", |
| - IDS_FLAGS_IGNORE_AUTOCOMPLETE_OFF_AUTOFILL_NAME, |
| - IDS_FLAGS_IGNORE_AUTOCOMPLETE_OFF_AUTOFILL_DESCRIPTION, |
| - kOsCrOS | kOsMac | kOsWin | kOsLinux, |
| - ENABLE_DISABLE_VALUE_TYPE( |
| - autofill::switches::kIgnoreAutocompleteOffForAutofill, |
| - autofill::switches::kRespectAutocompleteOffForAutofill) |
| - }, |
| - { |
| - "enable-single-click-autofill", |
| - IDS_FLAGS_ENABLE_SINGLE_CLICK_AUTOFILL_NAME, |
| - IDS_FLAGS_ENABLE_SINGLE_CLICK_AUTOFILL_DESCRIPTION, |
| - kOsCrOS | kOsMac | kOsWin | kOsLinux | kOsAndroid, |
| - ENABLE_DISABLE_VALUE_TYPE( |
| - autofill::switches::kEnableSingleClickAutofill, |
| - autofill::switches::kDisableSingleClickAutofill) |
| - }, |
| - { |
| - "enable-wallet-card-import", |
| - IDS_FLAGS_ENABLE_WALLET_CARD_IMPORT_NAME, |
| - IDS_FLAGS_ENABLE_WALLET_CARD_IMPORT_DESCRIPTION, |
| - kOsCrOS | kOsWin | kOsLinux | kOsAndroid, |
| - SINGLE_VALUE_TYPE(autofill::switches::kEnableWalletCardImport) |
| - }, |
| - { |
| - "enable-permissions-bubbles", |
| - IDS_FLAGS_ENABLE_PERMISSIONS_BUBBLES_NAME, |
| - IDS_FLAGS_ENABLE_PERMISSIONS_BUBBLES_DESCRIPTION, |
| - kOsCrOS | kOsMac | kOsWin | kOsLinux, |
| - ENABLE_DISABLE_VALUE_TYPE(switches::kEnablePermissionsBubbles, |
| - switches::kDisablePermissionsBubbles) |
| - }, |
| - { |
| - "enable-session-crashed-bubble", |
| - IDS_FLAGS_ENABLE_SESSION_CRASHED_BUBBLE_NAME, |
| - IDS_FLAGS_ENABLE_SESSION_CRASHED_BUBBLE_DESCRIPTION, |
| - kOsWin | kOsLinux, |
| - ENABLE_DISABLE_VALUE_TYPE(switches::kEnableSessionCrashedBubble, |
| - switches::kDisableSessionCrashedBubble) |
| - }, |
| - { |
| - "enable-out-of-process-pdf", |
| - IDS_FLAGS_OUT_OF_PROCESS_PDF_NAME, |
| - IDS_FLAGS_OUT_OF_PROCESS_PDF_DESCRIPTION, |
| - kOsDesktop, |
| - ENABLE_DISABLE_VALUE_TYPE(switches::kEnableOutOfProcessPdf, |
| - switches::kDisableOutOfProcessPdf) |
| - }, |
| - { |
| - "disable-cast-streaming-hw-encoding", |
| - IDS_FLAGS_DISABLE_CAST_STREAMING_HW_ENCODING_NAME, |
| - IDS_FLAGS_DISABLE_CAST_STREAMING_HW_ENCODING_DESCRIPTION, |
| - kOsAll, |
| - SINGLE_VALUE_TYPE(switches::kDisableCastStreamingHWEncoding) |
| - }, |
| + {"enable-zero-suggest-experiment", |
| + IDS_FLAGS_ZERO_SUGGEST_EXPERIMENT_NAME, |
| + IDS_FLAGS_ZERO_SUGGEST_EXPERIMENT_DESCRIPTION, |
| + kOsAndroid, |
| + MULTI_VALUE_TYPE(kZeroSuggestExperimentsChoices)}, |
| + {"enable-reader-mode-toolbar-icon", |
| + IDS_FLAGS_READER_MODE_EXPERIMENT_NAME, |
| + IDS_FLAGS_READER_MODE_EXPERIMENT_DESCRIPTION, |
| + kOsAndroid, |
| + SINGLE_VALUE_TYPE(switches::kEnableReaderModeToolbarIcon)}, |
| +#endif |
| + {"num-raster-threads", |
| + IDS_FLAGS_NUM_RASTER_THREADS_NAME, |
| + IDS_FLAGS_NUM_RASTER_THREADS_DESCRIPTION, |
| + kOsAll, |
| + MULTI_VALUE_TYPE(kNumRasterThreadsChoices)}, |
| + {"origin-chip-in-omnibox", |
| + IDS_FLAGS_ORIGIN_CHIP_NAME, |
| + IDS_FLAGS_ORIGIN_CHIP_DESCRIPTION, |
| + kOsCrOS | kOsMac | kOsWin | kOsLinux, |
| + MULTI_VALUE_TYPE(kOriginChipChoices)}, |
| + {"search-button-in-omnibox", |
| + IDS_FLAGS_SEARCH_BUTTON_IN_OMNIBOX_NAME, |
| + IDS_FLAGS_SEARCH_BUTTON_IN_OMNIBOX_DESCRIPTION, |
| + kOsCrOS | kOsMac | kOsWin | kOsLinux, |
| + MULTI_VALUE_TYPE(kSearchButtonInOmniboxChoices)}, |
| + {"ignore-autocomplete-off-autofill", |
| + IDS_FLAGS_IGNORE_AUTOCOMPLETE_OFF_AUTOFILL_NAME, |
| + IDS_FLAGS_IGNORE_AUTOCOMPLETE_OFF_AUTOFILL_DESCRIPTION, |
| + kOsCrOS | kOsMac | kOsWin | kOsLinux, |
| + ENABLE_DISABLE_VALUE_TYPE( |
| + autofill::switches::kIgnoreAutocompleteOffForAutofill, |
| + autofill::switches::kRespectAutocompleteOffForAutofill)}, |
| + {"enable-single-click-autofill", |
| + IDS_FLAGS_ENABLE_SINGLE_CLICK_AUTOFILL_NAME, |
| + IDS_FLAGS_ENABLE_SINGLE_CLICK_AUTOFILL_DESCRIPTION, |
| + kOsCrOS | kOsMac | kOsWin | kOsLinux | kOsAndroid, |
| + ENABLE_DISABLE_VALUE_TYPE( |
| + autofill::switches::kEnableSingleClickAutofill, |
| + autofill::switches::kDisableSingleClickAutofill)}, |
| + {"enable-wallet-card-import", |
| + IDS_FLAGS_ENABLE_WALLET_CARD_IMPORT_NAME, |
| + IDS_FLAGS_ENABLE_WALLET_CARD_IMPORT_DESCRIPTION, |
| + kOsCrOS | kOsWin | kOsLinux | kOsAndroid, |
| + SINGLE_VALUE_TYPE(autofill::switches::kEnableWalletCardImport)}, |
| + {"enable-permissions-bubbles", |
| + IDS_FLAGS_ENABLE_PERMISSIONS_BUBBLES_NAME, |
| + IDS_FLAGS_ENABLE_PERMISSIONS_BUBBLES_DESCRIPTION, |
| + kOsCrOS | kOsMac | kOsWin | kOsLinux, |
| + ENABLE_DISABLE_VALUE_TYPE(switches::kEnablePermissionsBubbles, |
| + switches::kDisablePermissionsBubbles)}, |
| + {"enable-session-crashed-bubble", |
| + IDS_FLAGS_ENABLE_SESSION_CRASHED_BUBBLE_NAME, |
| + IDS_FLAGS_ENABLE_SESSION_CRASHED_BUBBLE_DESCRIPTION, |
| + kOsWin | kOsLinux, |
| + ENABLE_DISABLE_VALUE_TYPE(switches::kEnableSessionCrashedBubble, |
| + switches::kDisableSessionCrashedBubble)}, |
| + {"enable-out-of-process-pdf", |
| + IDS_FLAGS_OUT_OF_PROCESS_PDF_NAME, |
| + IDS_FLAGS_OUT_OF_PROCESS_PDF_DESCRIPTION, |
| + kOsDesktop, |
| + ENABLE_DISABLE_VALUE_TYPE(switches::kEnableOutOfProcessPdf, |
| + switches::kDisableOutOfProcessPdf)}, |
| + {"disable-cast-streaming-hw-encoding", |
| + IDS_FLAGS_DISABLE_CAST_STREAMING_HW_ENCODING_NAME, |
| + IDS_FLAGS_DISABLE_CAST_STREAMING_HW_ENCODING_DESCRIPTION, |
| + kOsAll, |
| + SINGLE_VALUE_TYPE(switches::kDisableCastStreamingHWEncoding)}, |
| #if defined(OS_ANDROID) |
| - { |
| - "disable-cast", |
| - IDS_FLAGS_DISABLE_CAST_NAME, |
| - IDS_FLAGS_DISABLE_CAST_DESCRIPTION, |
| - kOsAndroid, |
| - SINGLE_VALUE_TYPE(switches::kDisableCast) |
| - }, |
| - { |
| - "prefetch-search-results", |
| - IDS_FLAGS_PREFETCH_SEARCH_RESULTS_NAME, |
| - IDS_FLAGS_PREFETCH_SEARCH_RESULTS_DESCRIPTION, |
| - kOsAndroid, |
| - SINGLE_VALUE_TYPE(switches::kPrefetchSearchResults) |
| - }, |
| + {"disable-cast", |
| + IDS_FLAGS_DISABLE_CAST_NAME, |
| + IDS_FLAGS_DISABLE_CAST_DESCRIPTION, |
| + kOsAndroid, |
| + SINGLE_VALUE_TYPE(switches::kDisableCast)}, |
| + {"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_ENABLE_EXPERIMENTAL_APP_LIST_NAME, |
| - IDS_FLAGS_ENABLE_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_ENABLE_CENTERED_APP_LIST_NAME, |
| - IDS_FLAGS_ENABLE_CENTERED_APP_LIST_DESCRIPTION, |
| - kOsWin | kOsLinux | kOsCrOS, |
| - SINGLE_VALUE_TYPE(app_list::switches::kEnableCenteredAppList) |
| - }, |
| -#endif |
| - { |
| - "touch-scrolling-mode", |
| - IDS_FLAGS_TOUCH_SCROLLING_MODE_NAME, |
| - IDS_FLAGS_TOUCH_SCROLLING_MODE_DESCRIPTION, |
| - kOsWin | kOsLinux | kOsCrOS | kOsAndroid, |
| - MULTI_VALUE_TYPE(kTouchScrollingModeChoices) |
| - }, |
| - { |
| - "disable-threaded-scrolling", |
| - IDS_FLAGS_DISABLE_THREADED_SCROLLING_NAME, |
| - IDS_FLAGS_DISABLE_THREADED_SCROLLING_DESCRIPTION, |
| - kOsWin | kOsLinux | kOsCrOS | kOsAndroid, |
| - SINGLE_VALUE_TYPE(switches::kDisableThreadedScrolling) |
| - }, |
| - { |
| - "bleeding-edge-renderer-mode", |
| - IDS_FLAGS_BLEEDING_RENDERER_NAME, |
| - IDS_FLAGS_BLEEDING_RENDERER_DESCRIPTION, |
| - kOsAndroid, |
| - SINGLE_VALUE_TYPE(switches::kEnableBleedingEdgeRenderingFastPaths) |
| - }, |
| - { |
| - "enable-settings-window", |
| - IDS_FLAGS_ENABLE_SETTINGS_WINDOW_NAME, |
| - IDS_FLAGS_ENABLE_SETTINGS_WINDOW_DESCRIPTION, |
| - kOsDesktop, |
| - ENABLE_DISABLE_VALUE_TYPE(switches::kEnableSettingsWindow, |
| - switches::kDisableSettingsWindow) |
| - }, |
| + {"enable-experimental-app-list", |
| + IDS_FLAGS_ENABLE_EXPERIMENTAL_APP_LIST_NAME, |
| + IDS_FLAGS_ENABLE_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_ENABLE_CENTERED_APP_LIST_NAME, |
| + IDS_FLAGS_ENABLE_CENTERED_APP_LIST_DESCRIPTION, |
| + kOsWin | kOsLinux | kOsCrOS, |
| + SINGLE_VALUE_TYPE(app_list::switches::kEnableCenteredAppList)}, |
| +#endif |
| + {"touch-scrolling-mode", |
| + IDS_FLAGS_TOUCH_SCROLLING_MODE_NAME, |
| + IDS_FLAGS_TOUCH_SCROLLING_MODE_DESCRIPTION, |
| + kOsWin | kOsLinux | kOsCrOS | kOsAndroid, |
| + MULTI_VALUE_TYPE(kTouchScrollingModeChoices)}, |
| + {"disable-threaded-scrolling", |
| + IDS_FLAGS_DISABLE_THREADED_SCROLLING_NAME, |
| + IDS_FLAGS_DISABLE_THREADED_SCROLLING_DESCRIPTION, |
| + kOsWin | kOsLinux | kOsCrOS | kOsAndroid, |
| + SINGLE_VALUE_TYPE(switches::kDisableThreadedScrolling)}, |
| + {"bleeding-edge-renderer-mode", |
| + IDS_FLAGS_BLEEDING_RENDERER_NAME, |
| + IDS_FLAGS_BLEEDING_RENDERER_DESCRIPTION, |
| + kOsAndroid, |
| + SINGLE_VALUE_TYPE(switches::kEnableBleedingEdgeRenderingFastPaths)}, |
| + {"enable-settings-window", |
| + IDS_FLAGS_ENABLE_SETTINGS_WINDOW_NAME, |
| + IDS_FLAGS_ENABLE_SETTINGS_WINDOW_DESCRIPTION, |
| + kOsDesktop, |
| + ENABLE_DISABLE_VALUE_TYPE(switches::kEnableSettingsWindow, |
| + switches::kDisableSettingsWindow)}, |
| #if defined(OS_ANDROID) |
| - { |
| - "enable-instant-search-clicks", |
| - IDS_FLAGS_ENABLE_INSTANT_SEARCH_CLICKS_NAME, |
| - IDS_FLAGS_ENABLE_INSTANT_SEARCH_CLICKS_DESCRIPTION, |
| - kOsAndroid, |
| - SINGLE_VALUE_TYPE(switches::kEnableInstantSearchClicks) |
| - }, |
| -#endif |
| - { |
| - "enable-save-password-bubble", |
| - IDS_FLAGS_ENABLE_SAVE_PASSWORD_BUBBLE_NAME, |
| - IDS_FLAGS_ENABLE_SAVE_PASSWORD_BUBBLE_DESCRIPTION, |
| - kOsWin | kOsLinux | kOsCrOS | kOsMac, |
| - ENABLE_DISABLE_VALUE_TYPE(switches::kEnableSavePasswordBubble, |
| - switches::kDisableSavePasswordBubble) |
| - }, |
| - // TODO(tyoshino): Remove this temporary flag and command line switch. See |
| - // crbug.com/366483 for the target milestone. |
| - { |
| - "allow-insecure-websocket-from-https-origin", |
| - IDS_FLAGS_ALLOW_INSECURE_WEBSOCKET_FROM_HTTPS_ORIGIN_NAME, |
| - IDS_FLAGS_ALLOW_INSECURE_WEBSOCKET_FROM_HTTPS_ORIGIN_DESCRIPTION, |
| - kOsAll, |
| - SINGLE_VALUE_TYPE(switches::kAllowInsecureWebSocketFromHttpsOrigin) |
| - }, |
| - { |
| - "enable-apps-file-associations", |
| - IDS_FLAGS_ENABLE_APPS_FILE_ASSOCIATIONS_NAME, |
| - IDS_FLAGS_ENABLE_APPS_FILE_ASSOCIATIONS_DESCRIPTION, |
| - kOsMac, |
| - SINGLE_VALUE_TYPE(switches::kEnableAppsFileAssociations) |
| - }, |
| + {"enable-instant-search-clicks", |
| + IDS_FLAGS_ENABLE_INSTANT_SEARCH_CLICKS_NAME, |
| + IDS_FLAGS_ENABLE_INSTANT_SEARCH_CLICKS_DESCRIPTION, |
| + kOsAndroid, |
| + SINGLE_VALUE_TYPE(switches::kEnableInstantSearchClicks)}, |
| +#endif |
| + {"enable-save-password-bubble", |
| + IDS_FLAGS_ENABLE_SAVE_PASSWORD_BUBBLE_NAME, |
| + IDS_FLAGS_ENABLE_SAVE_PASSWORD_BUBBLE_DESCRIPTION, |
| + kOsWin | kOsLinux | kOsCrOS | kOsMac, |
| + ENABLE_DISABLE_VALUE_TYPE(switches::kEnableSavePasswordBubble, |
| + switches::kDisableSavePasswordBubble)}, |
| + // TODO(tyoshino): Remove this temporary flag and command line switch. See |
| + // crbug.com/366483 for the target milestone. |
| + {"allow-insecure-websocket-from-https-origin", |
| + IDS_FLAGS_ALLOW_INSECURE_WEBSOCKET_FROM_HTTPS_ORIGIN_NAME, |
| + IDS_FLAGS_ALLOW_INSECURE_WEBSOCKET_FROM_HTTPS_ORIGIN_DESCRIPTION, |
| + kOsAll, |
| + SINGLE_VALUE_TYPE(switches::kAllowInsecureWebSocketFromHttpsOrigin)}, |
| + {"enable-apps-file-associations", |
| + IDS_FLAGS_ENABLE_APPS_FILE_ASSOCIATIONS_NAME, |
| + IDS_FLAGS_ENABLE_APPS_FILE_ASSOCIATIONS_DESCRIPTION, |
| + kOsMac, |
| + SINGLE_VALUE_TYPE(switches::kEnableAppsFileAssociations)}, |
| #if defined(OS_ANDROID) |
| - { |
| - "enable-embeddedsearch-api", |
| - IDS_FLAGS_ENABLE_EMBEDDEDSEARCH_API_NAME, |
| - IDS_FLAGS_ENABLE_EMBEDDEDSEARCH_API_DESCRIPTION, |
| - kOsAndroid, |
| - SINGLE_VALUE_TYPE(switches::kEnableEmbeddedSearchAPI) |
| - }, |
| - { |
| - "enable-app-install-alerts", |
| - IDS_FLAGS_ENABLE_APP_INSTALL_ALERTS_NAME, |
| - IDS_FLAGS_ENABLE_APP_INSTALL_ALERTS_DESCRIPTION, |
| - kOsAndroid, |
| - SINGLE_VALUE_TYPE(switches::kEnableAppInstallAlerts) |
| - }, |
| -#endif |
| - { |
| - "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, |
| - MULTI_VALUE_TYPE(kExtensionContentVerificationChoices) |
| - }, |
| + {"enable-embeddedsearch-api", |
| + IDS_FLAGS_ENABLE_EMBEDDEDSEARCH_API_NAME, |
| + IDS_FLAGS_ENABLE_EMBEDDEDSEARCH_API_DESCRIPTION, |
| + kOsAndroid, |
| + SINGLE_VALUE_TYPE(switches::kEnableEmbeddedSearchAPI)}, |
| + {"enable-app-install-alerts", |
| + IDS_FLAGS_ENABLE_APP_INSTALL_ALERTS_NAME, |
| + IDS_FLAGS_ENABLE_APP_INSTALL_ALERTS_DESCRIPTION, |
| + kOsAndroid, |
| + SINGLE_VALUE_TYPE(switches::kEnableAppInstallAlerts)}, |
| +#endif |
| + {"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, |
| + MULTI_VALUE_TYPE(kExtensionContentVerificationChoices)}, |
| #if defined(USE_AURA) |
| - { |
| - "text-input-focus-manager", |
| - IDS_FLAGS_TEXT_INPUT_FOCUS_MANAGER_NAME, |
| - IDS_FLAGS_TEXT_INPUT_FOCUS_MANAGER_DESCRIPTION, |
| - kOsCrOS | kOsLinux | kOsWin, |
| - ENABLE_DISABLE_VALUE_TYPE(switches::kEnableTextInputFocusManager, |
| - switches::kDisableTextInputFocusManager) |
| - }, |
| + {"text-input-focus-manager", |
| + IDS_FLAGS_TEXT_INPUT_FOCUS_MANAGER_NAME, |
| + IDS_FLAGS_TEXT_INPUT_FOCUS_MANAGER_DESCRIPTION, |
| + kOsCrOS | kOsLinux | kOsWin, |
| + ENABLE_DISABLE_VALUE_TYPE(switches::kEnableTextInputFocusManager, |
| + switches::kDisableTextInputFocusManager)}, |
| #endif |
| #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, |
| - SINGLE_VALUE_TYPE(extensions::switches::kEnableScriptsRequireAction) |
| - }, |
| -#endif |
| - { |
| - "harfbuzz-rendertext", |
| - IDS_FLAGS_HARFBUZZ_RENDERTEXT_NAME, |
| - IDS_FLAGS_HARFBUZZ_RENDERTEXT_DESCRIPTION, |
| - kOsDesktop, |
| - ENABLE_DISABLE_VALUE_TYPE(switches::kEnableHarfBuzzRenderText, |
| - switches::kDisableHarfBuzzRenderText) |
| - }, |
| + {"extension-active-script-permission", |
| + IDS_FLAGS_USER_CONSENT_FOR_EXTENSION_SCRIPTS_NAME, |
| + IDS_FLAGS_USER_CONSENT_FOR_EXTENSION_SCRIPTS_DESCRIPTION, |
| + kOsAll, |
| + SINGLE_VALUE_TYPE(extensions::switches::kEnableScriptsRequireAction)}, |
| +#endif |
| + {"harfbuzz-rendertext", |
| + IDS_FLAGS_HARFBUZZ_RENDERTEXT_NAME, |
| + IDS_FLAGS_HARFBUZZ_RENDERTEXT_DESCRIPTION, |
| + kOsDesktop, |
| + ENABLE_DISABLE_VALUE_TYPE(switches::kEnableHarfBuzzRenderText, |
| + switches::kDisableHarfBuzzRenderText)}, |
| #if defined(OS_ANDROID) |
| - { |
| - "answers-in-suggest", |
| - IDS_FLAGS_ENABLE_ANSWERS_IN_SUGGEST_NAME, |
| - IDS_FLAGS_ENABLE_ANSWERS_IN_SUGGEST_DESCRIPTION, |
| - kOsAndroid, |
| - ENABLE_DISABLE_VALUE_TYPE(switches::kEnableAnswersInSuggest, |
| - switches::kDisableAnswersInSuggest) |
| - }, |
| + {"answers-in-suggest", |
| + IDS_FLAGS_ENABLE_ANSWERS_IN_SUGGEST_NAME, |
| + IDS_FLAGS_ENABLE_ANSWERS_IN_SUGGEST_DESCRIPTION, |
| + kOsAndroid, |
| + ENABLE_DISABLE_VALUE_TYPE(switches::kEnableAnswersInSuggest, |
| + switches::kDisableAnswersInSuggest)}, |
| #endif |
| #if defined(OS_ANDROID) |
| - { |
| - "enable-data-reduction-proxy-dev", |
| - IDS_FLAGS_ENABLE_DATA_REDUCTION_PROXY_DEV_NAME, |
| - IDS_FLAGS_ENABLE_DATA_REDUCTION_PROXY_DEV_DESCRIPTION, |
| - kOsAndroid, |
| - ENABLE_DISABLE_VALUE_TYPE( |
| - data_reduction_proxy::switches::kEnableDataReductionProxyDev, |
| - data_reduction_proxy::switches::kDisableDataReductionProxyDev) |
| - }, |
| - { |
| - "enable-data-reduction-proxy-alt", |
| - IDS_FLAGS_ENABLE_DATA_REDUCTION_PROXY_ALTERNATIVE_NAME, |
| - IDS_FLAGS_ENABLE_DATA_REDUCTION_PROXY_ALTERNATIVE_DESCRIPTION, |
| - kOsAndroid, |
| - SINGLE_VALUE_TYPE( |
| - data_reduction_proxy::switches::kEnableDataReductionProxyAlt) |
| - }, |
| -#endif |
| - { |
| - "disable-experimental-hotwording", |
| - IDS_FLAGS_DISABLE_EXPERIMENTAL_HOTWORDING_NAME, |
| - IDS_FLAGS_DISABLE_EXPERIMENTAL_HOTWORDING_DESCRIPTION, |
| - kOsDesktop, |
| - SINGLE_VALUE_TYPE(switches::kDisableExperimentalHotwording) |
| - }, |
| - { |
| - "enable-hotword-hardware", |
| - IDS_FLAGS_ENABLE_EXPERIMENTAL_HOTWORD_HARDWARE_NAME, |
| - IDS_FLAGS_ENABLE_EXPERIMENTAL_HOTWORD_HARDWARE_DESCRIPTION, |
| - kOsCrOS, |
| - SINGLE_VALUE_TYPE(switches::kEnableExperimentalHotwordHardware) |
| - }, |
| + {"enable-data-reduction-proxy-dev", |
| + IDS_FLAGS_ENABLE_DATA_REDUCTION_PROXY_DEV_NAME, |
| + IDS_FLAGS_ENABLE_DATA_REDUCTION_PROXY_DEV_DESCRIPTION, |
| + kOsAndroid, |
| + ENABLE_DISABLE_VALUE_TYPE( |
| + data_reduction_proxy::switches::kEnableDataReductionProxyDev, |
| + data_reduction_proxy::switches::kDisableDataReductionProxyDev)}, |
| + {"enable-data-reduction-proxy-alt", |
| + IDS_FLAGS_ENABLE_DATA_REDUCTION_PROXY_ALTERNATIVE_NAME, |
| + IDS_FLAGS_ENABLE_DATA_REDUCTION_PROXY_ALTERNATIVE_DESCRIPTION, |
| + kOsAndroid, |
| + SINGLE_VALUE_TYPE( |
| + data_reduction_proxy::switches::kEnableDataReductionProxyAlt)}, |
| +#endif |
| + {"disable-experimental-hotwording", |
| + IDS_FLAGS_DISABLE_EXPERIMENTAL_HOTWORDING_NAME, |
| + IDS_FLAGS_DISABLE_EXPERIMENTAL_HOTWORDING_DESCRIPTION, |
| + kOsDesktop, |
| + SINGLE_VALUE_TYPE(switches::kDisableExperimentalHotwording)}, |
| + {"enable-hotword-hardware", |
| + IDS_FLAGS_ENABLE_EXPERIMENTAL_HOTWORD_HARDWARE_NAME, |
| + IDS_FLAGS_ENABLE_EXPERIMENTAL_HOTWORD_HARDWARE_DESCRIPTION, |
| + kOsCrOS, |
| + SINGLE_VALUE_TYPE(switches::kEnableExperimentalHotwordHardware)}, |
| #if defined(ENABLE_EXTENSIONS) |
| - { |
| - "enable-embedded-extension-options", |
| - IDS_FLAGS_ENABLE_EMBEDDED_EXTENSION_OPTIONS_NAME, |
| - IDS_FLAGS_ENABLE_EMBEDDED_EXTENSION_OPTIONS_DESCRIPTION, |
| - kOsDesktop, |
| - SINGLE_VALUE_TYPE(extensions::switches::kEnableEmbeddedExtensionOptions) |
| - }, |
| + {"enable-embedded-extension-options", |
| + IDS_FLAGS_ENABLE_EMBEDDED_EXTENSION_OPTIONS_NAME, |
| + IDS_FLAGS_ENABLE_EMBEDDED_EXTENSION_OPTIONS_DESCRIPTION, |
| + kOsDesktop, |
| + SINGLE_VALUE_TYPE(extensions::switches::kEnableEmbeddedExtensionOptions)}, |
| #endif |
| #if defined(USE_ASH) |
| - { |
| - "enable-web-app-frame", |
| - IDS_FLAGS_ENABLE_WEB_APP_FRAME_NAME, |
| - IDS_FLAGS_ENABLE_WEB_APP_FRAME_DESCRIPTION, |
| - kOsWin | kOsCrOS, |
| - SINGLE_VALUE_TYPE(switches::kEnableWebAppFrame) |
| - }, |
| -#endif |
| - { |
| - "enable-website-settings-manager", |
| - IDS_FLAGS_ENABLE_WEBSITE_SETTINGS_NAME, |
| - IDS_FLAGS_ENABLE_WEBSITE_SETTINGS_DESCRIPTION, |
| - kOsDesktop, |
| - SINGLE_VALUE_TYPE(switches::kEnableWebsiteSettingsManager) |
| - }, |
| - { |
| - "remember-cert-error-decisions", |
| - IDS_FLAGS_REMEMBER_CERTIFICATE_ERROR_DECISIONS_NAME, |
| - IDS_FLAGS_REMEMBER_CERTIFICATE_ERROR_DECISIONS_DESCRIPTION, |
| - kOsAll, |
| - MULTI_VALUE_TYPE(kRememberCertificateErrorDecisionsChoices) |
| - }, |
| - { |
| - "enable-drop-sync-credential", |
| - IDS_FLAGS_ENABLE_DROP_SYNC_CREDENTIAL_NAME, |
| - IDS_FLAGS_ENABLE_DROP_SYNC_CREDENTIAL_DESCRIPTION, |
| - kOsAll, |
| - ENABLE_DISABLE_VALUE_TYPE( |
| - password_manager::switches::kEnableDropSyncCredential, |
| - password_manager::switches::kDisableDropSyncCredential) |
| - }, |
| + {"enable-web-app-frame", |
| + IDS_FLAGS_ENABLE_WEB_APP_FRAME_NAME, |
| + IDS_FLAGS_ENABLE_WEB_APP_FRAME_DESCRIPTION, |
| + kOsWin | kOsCrOS, |
| + SINGLE_VALUE_TYPE(switches::kEnableWebAppFrame)}, |
| +#endif |
| + {"enable-website-settings-manager", |
| + IDS_FLAGS_ENABLE_WEBSITE_SETTINGS_NAME, |
| + IDS_FLAGS_ENABLE_WEBSITE_SETTINGS_DESCRIPTION, |
| + kOsDesktop, |
| + SINGLE_VALUE_TYPE(switches::kEnableWebsiteSettingsManager)}, |
| + {"remember-cert-error-decisions", |
| + IDS_FLAGS_REMEMBER_CERTIFICATE_ERROR_DECISIONS_NAME, |
| + IDS_FLAGS_REMEMBER_CERTIFICATE_ERROR_DECISIONS_DESCRIPTION, |
| + kOsAll, |
| + MULTI_VALUE_TYPE(kRememberCertificateErrorDecisionsChoices)}, |
| + {"enable-drop-sync-credential", |
| + IDS_FLAGS_ENABLE_DROP_SYNC_CREDENTIAL_NAME, |
| + IDS_FLAGS_ENABLE_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_ENABLE_EXTENSION_ACTION_REDESIGN_NAME, |
| - IDS_FLAGS_ENABLE_EXTENSION_ACTION_REDESIGN_DESCRIPTION, |
| - kOsWin | kOsLinux | kOsCrOS, |
| - SINGLE_VALUE_TYPE(extensions::switches::kEnableExtensionActionRedesign) |
| - }, |
| -#endif |
| - { |
| - "autofill-sync-credential", |
| - IDS_FLAGS_AUTOFILL_SYNC_CREDENTIAL_NAME, |
| - IDS_FLAGS_AUTOFILL_SYNC_CREDENTIAL_DESCRIPTION, |
| - kOsAll, |
| - MULTI_VALUE_TYPE(kAutofillSyncCredentialChoices) |
| - }, |
| + {"enable-extension-action-redesign", |
| + IDS_FLAGS_ENABLE_EXTENSION_ACTION_REDESIGN_NAME, |
| + IDS_FLAGS_ENABLE_EXTENSION_ACTION_REDESIGN_DESCRIPTION, |
| + kOsWin | kOsLinux | kOsCrOS, |
| + SINGLE_VALUE_TYPE(extensions::switches::kEnableExtensionActionRedesign)}, |
| +#endif |
| + {"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", |
| - IDS_FLAGS_ENABLE_MESSAGE_CENTER_ALWAYS_SCROLL_UP_UPON_REMOVAL_NAME, |
| - IDS_FLAGS_ENABLE_MESSAGE_CENTER_ALWAYS_SCROLL_UP_UPON_REMOVAL_DESCRIPTION, |
| - kOsDesktop, |
| - SINGLE_VALUE_TYPE( |
| - switches::kEnableMessageCenterAlwaysScrollUpUponNotificationRemoval) |
| - }, |
| + {"enable-message-center-always-scroll-up-upon-notification-removal", |
| + IDS_FLAGS_ENABLE_MESSAGE_CENTER_ALWAYS_SCROLL_UP_UPON_REMOVAL_NAME, |
| + IDS_FLAGS_ENABLE_MESSAGE_CENTER_ALWAYS_SCROLL_UP_UPON_REMOVAL_DESCRIPTION, |
| + kOsDesktop, |
| + SINGLE_VALUE_TYPE( |
| + switches::kEnableMessageCenterAlwaysScrollUpUponNotificationRemoval)}, |
| #endif |
| #if defined(OS_CHROMEOS) |
| - { |
| - "use-memory-pressure-chromeos", |
| - IDS_FLAGS_USE_MEMORY_PRESSURE_NAME, |
| - IDS_FLAGS_USE_MEMORY_PRESSURE_DESCRIPTION, |
| - kOsCrOS, |
| - SINGLE_VALUE_TYPE(chromeos::switches::kUseMemoryPressureSystemChromeOS) |
| - }, |
| - { |
| - "wake-on-packets", |
| - IDS_FLAGS_WAKE_ON_PACKETS_NAME, |
| - IDS_FLAGS_WAKE_ON_PACKETS_DESCRIPTION, |
| - kOsCrOSOwnerOnly, |
| - SINGLE_VALUE_TYPE(chromeos::switches::kWakeOnPackets) |
| - }, |
| + {"use-memory-pressure-chromeos", |
| + IDS_FLAGS_USE_MEMORY_PRESSURE_NAME, |
| + IDS_FLAGS_USE_MEMORY_PRESSURE_DESCRIPTION, |
| + kOsCrOS, |
| + SINGLE_VALUE_TYPE(chromeos::switches::kUseMemoryPressureSystemChromeOS)}, |
| + {"wake-on-packets", |
| + IDS_FLAGS_WAKE_ON_PACKETS_NAME, |
| + IDS_FLAGS_WAKE_ON_PACKETS_DESCRIPTION, |
| + kOsCrOSOwnerOnly, |
| + SINGLE_VALUE_TYPE(chromeos::switches::kWakeOnPackets)}, |
| #endif // OS_CHROMEOS |
| - { |
| - "enable-tab-audio-muting", |
| - IDS_FLAGS_ENABLE_TAB_AUDIO_MUTING_NAME, |
| - IDS_FLAGS_ENABLE_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, |
| - SINGLE_VALUE_TYPE(switches::kEnableCredentialManagerAPI) |
| - }, |
| - { |
| - "reduced-referrer-granularity", |
| - IDS_FLAGS_REDUCED_REFERRER_GRANULARITY_NAME, |
| - IDS_FLAGS_REDUCED_REFERRER_GRANULARITY_DESCRIPTION, |
| - kOsAll, |
| - SINGLE_VALUE_TYPE(switches::kReducedReferrerGranularity) |
| - }, |
| + {"enable-tab-audio-muting", |
| + IDS_FLAGS_ENABLE_TAB_AUDIO_MUTING_NAME, |
| + IDS_FLAGS_ENABLE_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, |
| + SINGLE_VALUE_TYPE(switches::kEnableCredentialManagerAPI)}, |
| + {"reduced-referrer-granularity", |
| + IDS_FLAGS_REDUCED_REFERRER_GRANULARITY_NAME, |
| + IDS_FLAGS_REDUCED_REFERRER_GRANULARITY_DESCRIPTION, |
| + kOsAll, |
| + SINGLE_VALUE_TYPE(switches::kReducedReferrerGranularity)}, |
| #if defined(ENABLE_PLUGINS) |
| - { |
| - "enable-plugin-power-saver", |
| - IDS_FLAGS_ENABLE_PLUGIN_POWER_SAVER_NAME, |
| - IDS_FLAGS_ENABLE_PLUGIN_POWER_SAVER_DESCRIPTION, |
| - kOsDesktop, |
| - SINGLE_VALUE_TYPE(switches::kEnablePluginPowerSaver) |
| - }, |
| + {"enable-plugin-power-saver", |
| + IDS_FLAGS_ENABLE_PLUGIN_POWER_SAVER_NAME, |
| + IDS_FLAGS_ENABLE_PLUGIN_POWER_SAVER_DESCRIPTION, |
| + kOsDesktop, |
| + SINGLE_VALUE_TYPE(switches::kEnablePluginPowerSaver)}, |
| #endif |
| #if defined(OS_CHROMEOS) |
| - { |
| - "disable-new-zip-unpacker", |
| - IDS_FLAGS_DISABLE_NEW_ZIP_UNPACKER_NAME, |
| - IDS_FLAGS_DISABLE_NEW_ZIP_UNPACKER_DESCRIPTION, |
| - kOsCrOS, |
| - SINGLE_VALUE_TYPE(chromeos::switches::kDisableNewZIPUnpacker) |
| - }, |
| + {"disable-new-zip-unpacker", |
| + IDS_FLAGS_DISABLE_NEW_ZIP_UNPACKER_NAME, |
| + IDS_FLAGS_DISABLE_NEW_ZIP_UNPACKER_DESCRIPTION, |
| + kOsCrOS, |
| + SINGLE_VALUE_TYPE(chromeos::switches::kDisableNewZIPUnpacker)}, |
| #endif // defined(OS_CHROMEOS) |
| - { |
| - "ssl-version-min", |
| - IDS_FLAGS_SSL_VERSION_MIN_NAME, |
| - IDS_FLAGS_SSL_VERSION_MIN_DESCRIPTION, |
| - kOsAll, |
| - MULTI_VALUE_TYPE(kSSLVersionMinChoices) |
| - }, |
| - { |
| - "enable-credit-card-scan", |
| - IDS_FLAGS_ENABLE_CREDIT_CARD_SCAN_NAME, |
| - IDS_FLAGS_ENABLE_CREDIT_CARD_SCAN_DESCRIPTION, |
| - kOsAndroid, |
| - ENABLE_DISABLE_VALUE_TYPE(autofill::switches::kEnableCreditCardScan, |
| - autofill::switches::kDisableCreditCardScan) |
| - }, |
| + {"ssl-version-min", |
| + IDS_FLAGS_SSL_VERSION_MIN_NAME, |
| + IDS_FLAGS_SSL_VERSION_MIN_DESCRIPTION, |
| + kOsAll, |
| + MULTI_VALUE_TYPE(kSSLVersionMinChoices)}, |
| + {"enable-credit-card-scan", |
| + IDS_FLAGS_ENABLE_CREDIT_CARD_SCAN_NAME, |
| + IDS_FLAGS_ENABLE_CREDIT_CARD_SCAN_DESCRIPTION, |
| + kOsAndroid, |
| + ENABLE_DISABLE_VALUE_TYPE(autofill::switches::kEnableCreditCardScan, |
| + autofill::switches::kDisableCreditCardScan)}, |
| #if defined(OS_CHROMEOS) |
| - { |
| - "enable-captive-portal-bypass-proxy", |
| - IDS_FLAGS_ENABLE_CAPTIVE_PORTAL_BYPASS_PROXY_NAME, |
| - IDS_FLAGS_ENABLE_CAPTIVE_PORTAL_BYPASS_PROXY_DESCRIPTION, |
| - kOsCrOS, |
| - SINGLE_VALUE_TYPE(chromeos::switches::kEnableCaptivePortalBypassProxy) |
| - }, |
| - { |
| - "enable-roboto-font-ui", |
| - IDS_FLAGS_ENABLE_ROBOTO_FONT_UI_NAME, |
| - IDS_FLAGS_ENABLE_ROBOTO_FONT_UI_DESCRIPTION, |
| - kOsCrOS, |
| - SINGLE_VALUE_TYPE(switches::kEnableRobotoFontUI) |
| - }, |
| + {"enable-captive-portal-bypass-proxy", |
| + IDS_FLAGS_ENABLE_CAPTIVE_PORTAL_BYPASS_PROXY_NAME, |
| + IDS_FLAGS_ENABLE_CAPTIVE_PORTAL_BYPASS_PROXY_DESCRIPTION, |
| + kOsCrOS, |
| + SINGLE_VALUE_TYPE(chromeos::switches::kEnableCaptivePortalBypassProxy)}, |
| + {"enable-roboto-font-ui", |
| + IDS_FLAGS_ENABLE_ROBOTO_FONT_UI_NAME, |
| + IDS_FLAGS_ENABLE_ROBOTO_FONT_UI_DESCRIPTION, |
| + kOsCrOS, |
| + SINGLE_VALUE_TYPE(switches::kEnableRobotoFontUI)}, |
| #endif // defined(OS_CHROMEOS) |
| #if defined(OS_ANDROID) |
| - { |
| - "enable-seccomp-filter-sandbox", |
| - IDS_FLAGS_ENABLE_SECCOMP_FILTER_SANDBOX_ANDROID_NAME, |
| - IDS_FLAGS_ENABLE_SECCOMP_FILTER_SANDBOX_ANDROID_DESCRIPTION, |
| - kOsAndroid, |
| - SINGLE_VALUE_TYPE(switches::kEnableSeccompFilterSandbox) |
| - }, |
| -#endif |
| - { |
| - "enable-touch-hover", |
| - IDS_FLAGS_ENABLE_TOUCH_HOVER_NAME, |
| - IDS_FLAGS_ENABLE_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_DISABLE_VALUE_TYPE(autofill::switches::kEnableFillOnAccountSelect, |
| - autofill::switches::kDisableFillOnAccountSelect) |
| - }, |
| - |
| - // 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. |
| + {"enable-seccomp-filter-sandbox", |
| + IDS_FLAGS_ENABLE_SECCOMP_FILTER_SANDBOX_ANDROID_NAME, |
| + IDS_FLAGS_ENABLE_SECCOMP_FILTER_SANDBOX_ANDROID_DESCRIPTION, |
| + kOsAndroid, |
| + SINGLE_VALUE_TYPE(switches::kEnableSeccompFilterSandbox)}, |
| +#endif |
| + {"enable-touch-hover", |
| + IDS_FLAGS_ENABLE_TOUCH_HOVER_NAME, |
| + IDS_FLAGS_ENABLE_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_DISABLE_VALUE_TYPE( |
| + autofill::switches::kEnableFillOnAccountSelect, |
| + autofill::switches::kDisableFillOnAccountSelect)}, |
| + {"mark-http-as-non-secure", // FLAGS:RECORD_UMA |
| + IDS_MARK_HTTP_AS_NON_SECURE_NAME, |
| + IDS_MARK_HTTP_AS_NON_SECURE_DESCRIPTION, |
| + kOsAll, |
| + MULTI_VALUE_TYPE(kMarkHttpAsNonSecureChoices)}, |
| + |
| + // 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. |
| }; |
| const Experiment* experiments = kExperiments; |
