| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "chrome/browser/about_flags.h" | 5 #include "chrome/browser/about_flags.h" |
| 6 | 6 |
| 7 #include <iterator> | 7 #include <iterator> |
| 8 #include <map> | 8 #include <map> |
| 9 #include <set> | 9 #include <set> |
| 10 #include <utility> | 10 #include <utility> |
| (...skipping 116 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 127 using flags_ui::kOsAndroid; | 127 using flags_ui::kOsAndroid; |
| 128 using flags_ui::kOsCrOSOwnerOnly; | 128 using flags_ui::kOsCrOSOwnerOnly; |
| 129 | 129 |
| 130 namespace about_flags { | 130 namespace about_flags { |
| 131 | 131 |
| 132 namespace { | 132 namespace { |
| 133 | 133 |
| 134 const unsigned kOsAll = kOsMac | kOsWin | kOsLinux | kOsCrOS | kOsAndroid; | 134 const unsigned kOsAll = kOsMac | kOsWin | kOsLinux | kOsCrOS | kOsAndroid; |
| 135 const unsigned kOsDesktop = kOsMac | kOsWin | kOsLinux | kOsCrOS; | 135 const unsigned kOsDesktop = kOsMac | kOsWin | kOsLinux | kOsCrOS; |
| 136 | 136 |
| 137 const FeatureEntry::Choice kTouchEventsChoices[] = { | 137 const FeatureEntry::Choice kTouchEventFeatureDetectionChoices[] = { |
| 138 { IDS_GENERIC_EXPERIMENT_CHOICE_AUTOMATIC, "", "" }, | 138 { IDS_GENERIC_EXPERIMENT_CHOICE_AUTOMATIC, "", "" }, |
| 139 { IDS_GENERIC_EXPERIMENT_CHOICE_ENABLED, | 139 { IDS_GENERIC_EXPERIMENT_CHOICE_ENABLED, |
| 140 switches::kTouchEvents, | 140 switches::kTouchEventFeatureDetection, |
| 141 switches::kTouchEventsEnabled }, | 141 switches::kTouchEventFeatureDetectionEnabled }, |
| 142 { IDS_GENERIC_EXPERIMENT_CHOICE_DISABLED, | 142 { IDS_GENERIC_EXPERIMENT_CHOICE_DISABLED, |
| 143 switches::kTouchEvents, | 143 switches::kTouchEventFeatureDetection, |
| 144 switches::kTouchEventsDisabled } | 144 switches::kTouchEventFeatureDetectionDisabled } |
| 145 }; | 145 }; |
| 146 | 146 |
| 147 #if defined(USE_AURA) | 147 #if defined(USE_AURA) |
| 148 const FeatureEntry::Choice kOverscrollHistoryNavigationChoices[] = { | 148 const FeatureEntry::Choice kOverscrollHistoryNavigationChoices[] = { |
| 149 { IDS_GENERIC_EXPERIMENT_CHOICE_ENABLED, "", "" }, | 149 { IDS_GENERIC_EXPERIMENT_CHOICE_ENABLED, "", "" }, |
| 150 { IDS_GENERIC_EXPERIMENT_CHOICE_DISABLED, | 150 { IDS_GENERIC_EXPERIMENT_CHOICE_DISABLED, |
| 151 switches::kOverscrollHistoryNavigation, | 151 switches::kOverscrollHistoryNavigation, |
| 152 "0" }, | 152 "0" }, |
| 153 { IDS_OVERSCROLL_HISTORY_NAVIGATION_SIMPLE_UI, | 153 { IDS_OVERSCROLL_HISTORY_NAVIGATION_SIMPLE_UI, |
| 154 switches::kOverscrollHistoryNavigation, | 154 switches::kOverscrollHistoryNavigation, |
| (...skipping 703 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 858 IDS_FLAGS_TOP_CHROME_MD_DESCRIPTION, kOsDesktop, | 858 IDS_FLAGS_TOP_CHROME_MD_DESCRIPTION, kOsDesktop, |
| 859 MULTI_VALUE_TYPE(kTopChromeMaterialDesignChoices)}, | 859 MULTI_VALUE_TYPE(kTopChromeMaterialDesignChoices)}, |
| 860 {"enable-site-settings", IDS_FLAGS_SITE_SETTINGS, | 860 {"enable-site-settings", IDS_FLAGS_SITE_SETTINGS, |
| 861 IDS_FLAGS_SITE_SETTINGS_DESCRIPTION, kOsDesktop, | 861 IDS_FLAGS_SITE_SETTINGS_DESCRIPTION, kOsDesktop, |
| 862 SINGLE_VALUE_TYPE(switches::kEnableSiteSettings)}, | 862 SINGLE_VALUE_TYPE(switches::kEnableSiteSettings)}, |
| 863 {"secondary-ui-md", IDS_FLAGS_SECONDARY_UI_MD, | 863 {"secondary-ui-md", IDS_FLAGS_SECONDARY_UI_MD, |
| 864 IDS_FLAGS_SECONDARY_UI_MD_DESCRIPTION, kOsDesktop, | 864 IDS_FLAGS_SECONDARY_UI_MD_DESCRIPTION, kOsDesktop, |
| 865 SINGLE_VALUE_TYPE(switches::kExtendMdToSecondaryUi)}, | 865 SINGLE_VALUE_TYPE(switches::kExtendMdToSecondaryUi)}, |
| 866 {"touch-events", IDS_FLAGS_TOUCH_EVENTS_NAME, | 866 {"touch-events", IDS_FLAGS_TOUCH_EVENTS_NAME, |
| 867 IDS_FLAGS_TOUCH_EVENTS_DESCRIPTION, kOsDesktop, | 867 IDS_FLAGS_TOUCH_EVENTS_DESCRIPTION, kOsDesktop, |
| 868 MULTI_VALUE_TYPE(kTouchEventsChoices)}, | 868 MULTI_VALUE_TYPE(kTouchEventFeatureDetectionChoices)}, |
| 869 {"disable-touch-adjustment", IDS_FLAGS_TOUCH_ADJUSTMENT_NAME, | 869 {"disable-touch-adjustment", IDS_FLAGS_TOUCH_ADJUSTMENT_NAME, |
| 870 IDS_FLAGS_TOUCH_ADJUSTMENT_DESCRIPTION, | 870 IDS_FLAGS_TOUCH_ADJUSTMENT_DESCRIPTION, |
| 871 kOsWin | kOsLinux | kOsCrOS | kOsAndroid, | 871 kOsWin | kOsLinux | kOsCrOS | kOsAndroid, |
| 872 SINGLE_DISABLE_VALUE_TYPE(switches::kDisableTouchAdjustment)}, | 872 SINGLE_DISABLE_VALUE_TYPE(switches::kDisableTouchAdjustment)}, |
| 873 #if defined(OS_CHROMEOS) | 873 #if defined(OS_CHROMEOS) |
| 874 {"network-portal-notification", IDS_FLAGS_NETWORK_PORTAL_NOTIFICATION_NAME, | 874 {"network-portal-notification", IDS_FLAGS_NETWORK_PORTAL_NOTIFICATION_NAME, |
| 875 IDS_FLAGS_NETWORK_PORTAL_NOTIFICATION_DESCRIPTION, kOsCrOS, | 875 IDS_FLAGS_NETWORK_PORTAL_NOTIFICATION_DESCRIPTION, kOsCrOS, |
| 876 ENABLE_DISABLE_VALUE_TYPE( | 876 ENABLE_DISABLE_VALUE_TYPE( |
| 877 chromeos::switches::kEnableNetworkPortalNotification, | 877 chromeos::switches::kEnableNetworkPortalNotification, |
| 878 chromeos::switches::kDisableNetworkPortalNotification)}, | 878 chromeos::switches::kDisableNetworkPortalNotification)}, |
| (...skipping 1103 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1982 {"fill-on-account-select", IDS_FILL_ON_ACCOUNT_SELECT_NAME, | 1982 {"fill-on-account-select", IDS_FILL_ON_ACCOUNT_SELECT_NAME, |
| 1983 IDS_FILL_ON_ACCOUNT_SELECT_DESCRIPTION, kOsAll, | 1983 IDS_FILL_ON_ACCOUNT_SELECT_DESCRIPTION, kOsAll, |
| 1984 FEATURE_VALUE_TYPE(password_manager::features::kFillOnAccountSelect)}, | 1984 FEATURE_VALUE_TYPE(password_manager::features::kFillOnAccountSelect)}, |
| 1985 {"new-audio-rendering-mixing-strategy", | 1985 {"new-audio-rendering-mixing-strategy", |
| 1986 IDS_NEW_AUDIO_RENDERING_MIXING_STRATEGY_NAME, | 1986 IDS_NEW_AUDIO_RENDERING_MIXING_STRATEGY_NAME, |
| 1987 IDS_NEW_AUDIO_RENDERING_MIXING_STRATEGY_DESCRIPTION, | 1987 IDS_NEW_AUDIO_RENDERING_MIXING_STRATEGY_DESCRIPTION, |
| 1988 kOsWin | kOsMac | kOsLinux | kOsAndroid, | 1988 kOsWin | kOsMac | kOsLinux | kOsAndroid, |
| 1989 FEATURE_VALUE_TYPE(media::kNewAudioRenderingMixingStrategy)}, | 1989 FEATURE_VALUE_TYPE(media::kNewAudioRenderingMixingStrategy)}, |
| 1990 {"disable-background-video-track", | 1990 {"disable-background-video-track", |
| 1991 IDS_BACKGROUND_VIDEO_TRACK_OPTIMIZATION_NAME, | 1991 IDS_BACKGROUND_VIDEO_TRACK_OPTIMIZATION_NAME, |
| 1992 IDS_BACKGROUND_VIDEO_TRACK_OPTIMIZATION_DESCRIPTION, | 1992 IDS_BACKGROUND_VIDEO_TRACK_OPTIMIZATION_DESCRIPTION, kOsAll, |
| 1993 kOsAll, | |
| 1994 FEATURE_VALUE_TYPE(media::kBackgroundVideoTrackOptimization)}, | 1993 FEATURE_VALUE_TYPE(media::kBackgroundVideoTrackOptimization)}, |
| 1995 #if defined(OS_CHROMEOS) | 1994 #if defined(OS_CHROMEOS) |
| 1996 {"files-quick-view", IDS_FLAGS_FILES_QUICK_VIEW_NAME, | 1995 {"files-quick-view", IDS_FLAGS_FILES_QUICK_VIEW_NAME, |
| 1997 IDS_FLAGS_FILES_QUICK_VIEW_DESCRIPTION, kOsCrOS, | 1996 IDS_FLAGS_FILES_QUICK_VIEW_DESCRIPTION, kOsCrOS, |
| 1998 ENABLE_DISABLE_VALUE_TYPE(chromeos::switches::kEnableFilesQuickView, | 1997 ENABLE_DISABLE_VALUE_TYPE(chromeos::switches::kEnableFilesQuickView, |
| 1999 chromeos::switches::kDisableFilesQuickView)}, | 1998 chromeos::switches::kDisableFilesQuickView)}, |
| 2000 {"quick-unlock-pin", IDS_FLAGS_QUICK_UNLOCK_PIN, | 1999 {"quick-unlock-pin", IDS_FLAGS_QUICK_UNLOCK_PIN, |
| 2001 IDS_FLAGS_QUICK_UNLOCK_PIN_DESCRIPTION, kOsCrOS, | 2000 IDS_FLAGS_QUICK_UNLOCK_PIN_DESCRIPTION, kOsCrOS, |
| 2002 FEATURE_VALUE_TYPE(features::kQuickUnlockPin)}, | 2001 FEATURE_VALUE_TYPE(features::kQuickUnlockPin)}, |
| 2003 #endif // OS_CHROMEOS | 2002 #endif // OS_CHROMEOS |
| (...skipping 76 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2080 #if defined(OS_ANDROID) | 2079 #if defined(OS_ANDROID) |
| 2081 {"enable-consistent-omnibox-geolocation", | 2080 {"enable-consistent-omnibox-geolocation", |
| 2082 IDS_FLAGS_ENABLE_CONSISTENT_OMNIBOX_GEOLOCATION_NAME, | 2081 IDS_FLAGS_ENABLE_CONSISTENT_OMNIBOX_GEOLOCATION_NAME, |
| 2083 IDS_FLAGS_ENABLE_CONSISTENT_OMNIBOX_GEOLOCATION_DESCRIPTION, kOsAndroid, | 2082 IDS_FLAGS_ENABLE_CONSISTENT_OMNIBOX_GEOLOCATION_DESCRIPTION, kOsAndroid, |
| 2084 FEATURE_VALUE_TYPE(features::kConsistentOmniboxGeolocation)}, | 2083 FEATURE_VALUE_TYPE(features::kConsistentOmniboxGeolocation)}, |
| 2085 {"concurrent-background-loading-on-svelte", | 2084 {"concurrent-background-loading-on-svelte", |
| 2086 IDS_FLAGS_OFFLINE_PAGES_SVELTE_CONCURRENT_LOADING_NAME, | 2085 IDS_FLAGS_OFFLINE_PAGES_SVELTE_CONCURRENT_LOADING_NAME, |
| 2087 IDS_FLAGS_OFFLINE_PAGES_SVELTE_CONCURRENT_LOADING_DESCRIPTION, kOsAndroid, | 2086 IDS_FLAGS_OFFLINE_PAGES_SVELTE_CONCURRENT_LOADING_DESCRIPTION, kOsAndroid, |
| 2088 FEATURE_VALUE_TYPE( | 2087 FEATURE_VALUE_TYPE( |
| 2089 offline_pages::kOfflinePagesSvelteConcurrentLoadingFeature)}, | 2088 offline_pages::kOfflinePagesSvelteConcurrentLoadingFeature)}, |
| 2090 {"web-payments-modifiers", | 2089 {"web-payments-modifiers", IDS_FLAGS_WEB_PAYMENTS_MODIFIERS_NAME, |
| 2091 IDS_FLAGS_WEB_PAYMENTS_MODIFIERS_NAME, | |
| 2092 IDS_FLAGS_WEB_PAYMENTS_MODIFIERS_DESCRIPTION, kOsAndroid, | 2090 IDS_FLAGS_WEB_PAYMENTS_MODIFIERS_DESCRIPTION, kOsAndroid, |
| 2093 FEATURE_VALUE_TYPE(chrome::android::kWebPaymentsModifiers)}, | 2091 FEATURE_VALUE_TYPE(chrome::android::kWebPaymentsModifiers)}, |
| 2094 #endif | 2092 #endif |
| 2095 {"cross-process-guests", IDS_FLAGS_CROSS_PROCESS_GUEST_VIEW_ISOLATION_NAME, | 2093 {"cross-process-guests", IDS_FLAGS_CROSS_PROCESS_GUEST_VIEW_ISOLATION_NAME, |
| 2096 IDS_FLAGS_CROSS_PROCESS_GUEST_VIEW_ISOLATION_DESCRIPTION, kOsDesktop, | 2094 IDS_FLAGS_CROSS_PROCESS_GUEST_VIEW_ISOLATION_DESCRIPTION, kOsDesktop, |
| 2097 FEATURE_VALUE_TYPE(features::kGuestViewCrossProcessFrames)}, | 2095 FEATURE_VALUE_TYPE(features::kGuestViewCrossProcessFrames)}, |
| 2098 #if !defined(OS_ANDROID) && !defined(OS_IOS) | 2096 #if !defined(OS_ANDROID) && !defined(OS_IOS) |
| 2099 {"media-remoting", IDS_FLAGS_MEDIA_REMOTING_NAME, | 2097 {"media-remoting", IDS_FLAGS_MEDIA_REMOTING_NAME, |
| 2100 IDS_FLAGS_MEDIA_REMOTING_DESCRIPTION, kOsDesktop, | 2098 IDS_FLAGS_MEDIA_REMOTING_DESCRIPTION, kOsDesktop, |
| 2101 FEATURE_VALUE_TYPE(features::kMediaRemoting)}, | 2099 FEATURE_VALUE_TYPE(features::kMediaRemoting)}, |
| (...skipping 203 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2305 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; | 2303 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; |
| 2306 | 2304 |
| 2307 const FeatureEntry* GetFeatureEntries(size_t* count) { | 2305 const FeatureEntry* GetFeatureEntries(size_t* count) { |
| 2308 *count = arraysize(kFeatureEntries); | 2306 *count = arraysize(kFeatureEntries); |
| 2309 return kFeatureEntries; | 2307 return kFeatureEntries; |
| 2310 } | 2308 } |
| 2311 | 2309 |
| 2312 } // namespace testing | 2310 } // namespace testing |
| 2313 | 2311 |
| 2314 } // namespace about_flags | 2312 } // namespace about_flags |
| OLD | NEW |