Chromium Code Reviews| 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 114 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 125 using flags_ui::kOsAndroid; | 125 using flags_ui::kOsAndroid; |
| 126 using flags_ui::kOsCrOSOwnerOnly; | 126 using flags_ui::kOsCrOSOwnerOnly; |
| 127 | 127 |
| 128 namespace about_flags { | 128 namespace about_flags { |
| 129 | 129 |
| 130 namespace { | 130 namespace { |
| 131 | 131 |
| 132 const unsigned kOsAll = kOsMac | kOsWin | kOsLinux | kOsCrOS | kOsAndroid; | 132 const unsigned kOsAll = kOsMac | kOsWin | kOsLinux | kOsCrOS | kOsAndroid; |
| 133 const unsigned kOsDesktop = kOsMac | kOsWin | kOsLinux | kOsCrOS; | 133 const unsigned kOsDesktop = kOsMac | kOsWin | kOsLinux | kOsCrOS; |
| 134 | 134 |
| 135 const FeatureEntry::Choice kTouchEventsChoices[] = { | |
| 136 { IDS_GENERIC_EXPERIMENT_CHOICE_AUTOMATIC, "", "" }, | |
| 137 { IDS_GENERIC_EXPERIMENT_CHOICE_ENABLED, | |
| 138 switches::kTouchEvents, | |
| 139 switches::kTouchEventsEnabled }, | |
| 140 { IDS_GENERIC_EXPERIMENT_CHOICE_DISABLED, | |
| 141 switches::kTouchEvents, | |
| 142 switches::kTouchEventsDisabled } | |
| 143 }; | |
| 144 | |
| 145 #if defined(USE_AURA) | 135 #if defined(USE_AURA) |
| 146 const FeatureEntry::Choice kOverscrollHistoryNavigationChoices[] = { | 136 const FeatureEntry::Choice kOverscrollHistoryNavigationChoices[] = { |
| 147 { IDS_GENERIC_EXPERIMENT_CHOICE_ENABLED, "", "" }, | 137 { IDS_GENERIC_EXPERIMENT_CHOICE_ENABLED, "", "" }, |
| 148 { IDS_GENERIC_EXPERIMENT_CHOICE_DISABLED, | 138 { IDS_GENERIC_EXPERIMENT_CHOICE_DISABLED, |
| 149 switches::kOverscrollHistoryNavigation, | 139 switches::kOverscrollHistoryNavigation, |
| 150 "0" }, | 140 "0" }, |
| 151 { IDS_OVERSCROLL_HISTORY_NAVIGATION_SIMPLE_UI, | 141 { IDS_OVERSCROLL_HISTORY_NAVIGATION_SIMPLE_UI, |
| 152 switches::kOverscrollHistoryNavigation, | 142 switches::kOverscrollHistoryNavigation, |
| 153 "2" } | 143 "2" } |
| 154 }; | 144 }; |
| (...skipping 699 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 854 SINGLE_VALUE_TYPE(switches::kEnableScrollPrediction)}, | 844 SINGLE_VALUE_TYPE(switches::kEnableScrollPrediction)}, |
| 855 {"top-chrome-md", IDS_FLAGS_TOP_CHROME_MD, | 845 {"top-chrome-md", IDS_FLAGS_TOP_CHROME_MD, |
| 856 IDS_FLAGS_TOP_CHROME_MD_DESCRIPTION, kOsDesktop, | 846 IDS_FLAGS_TOP_CHROME_MD_DESCRIPTION, kOsDesktop, |
| 857 MULTI_VALUE_TYPE(kTopChromeMaterialDesignChoices)}, | 847 MULTI_VALUE_TYPE(kTopChromeMaterialDesignChoices)}, |
| 858 {"enable-site-settings", IDS_FLAGS_SITE_SETTINGS, | 848 {"enable-site-settings", IDS_FLAGS_SITE_SETTINGS, |
| 859 IDS_FLAGS_SITE_SETTINGS_DESCRIPTION, kOsDesktop, | 849 IDS_FLAGS_SITE_SETTINGS_DESCRIPTION, kOsDesktop, |
| 860 SINGLE_VALUE_TYPE(switches::kEnableSiteSettings)}, | 850 SINGLE_VALUE_TYPE(switches::kEnableSiteSettings)}, |
| 861 {"secondary-ui-md", IDS_FLAGS_SECONDARY_UI_MD, | 851 {"secondary-ui-md", IDS_FLAGS_SECONDARY_UI_MD, |
| 862 IDS_FLAGS_SECONDARY_UI_MD_DESCRIPTION, kOsDesktop, | 852 IDS_FLAGS_SECONDARY_UI_MD_DESCRIPTION, kOsDesktop, |
| 863 SINGLE_VALUE_TYPE(switches::kExtendMdToSecondaryUi)}, | 853 SINGLE_VALUE_TYPE(switches::kExtendMdToSecondaryUi)}, |
| 864 {"touch-events", IDS_FLAGS_TOUCH_EVENTS_NAME, | 854 {"touch-event-api", IDS_FLAGS_TOUCH_EVENTS_NAME, |
|
mustaq
2016/11/15 20:33:58
Leave it as "touch-events". The |internal_name| sh
sunyunjia
2016/11/16 16:39:57
Done.
| |
| 865 IDS_FLAGS_TOUCH_EVENTS_DESCRIPTION, kOsDesktop, | 855 IDS_FLAGS_TOUCH_EVENTS_DESCRIPTION, kOsDesktop, |
| 866 MULTI_VALUE_TYPE(kTouchEventsChoices)}, | 856 SINGLE_DISABLE_VALUE_TYPE(switches::kDisableTouchEventAPI)}, |
|
mustaq
2016/11/15 20:33:58
The same reason as above: don't changed the expose
sunyunjia
2016/11/16 16:39:58
Done.
| |
| 867 {"disable-touch-adjustment", IDS_FLAGS_TOUCH_ADJUSTMENT_NAME, | 857 {"disable-touch-adjustment", IDS_FLAGS_TOUCH_ADJUSTMENT_NAME, |
| 868 IDS_FLAGS_TOUCH_ADJUSTMENT_DESCRIPTION, | 858 IDS_FLAGS_TOUCH_ADJUSTMENT_DESCRIPTION, |
| 869 kOsWin | kOsLinux | kOsCrOS | kOsAndroid, | 859 kOsWin | kOsLinux | kOsCrOS | kOsAndroid, |
| 870 SINGLE_DISABLE_VALUE_TYPE(switches::kDisableTouchAdjustment)}, | 860 SINGLE_DISABLE_VALUE_TYPE(switches::kDisableTouchAdjustment)}, |
| 871 #if defined(OS_CHROMEOS) | 861 #if defined(OS_CHROMEOS) |
| 872 {"network-portal-notification", IDS_FLAGS_NETWORK_PORTAL_NOTIFICATION_NAME, | 862 {"network-portal-notification", IDS_FLAGS_NETWORK_PORTAL_NOTIFICATION_NAME, |
| 873 IDS_FLAGS_NETWORK_PORTAL_NOTIFICATION_DESCRIPTION, kOsCrOS, | 863 IDS_FLAGS_NETWORK_PORTAL_NOTIFICATION_DESCRIPTION, kOsCrOS, |
| 874 ENABLE_DISABLE_VALUE_TYPE( | 864 ENABLE_DISABLE_VALUE_TYPE( |
| 875 chromeos::switches::kEnableNetworkPortalNotification, | 865 chromeos::switches::kEnableNetworkPortalNotification, |
| 876 chromeos::switches::kDisableNetworkPortalNotification)}, | 866 chromeos::switches::kDisableNetworkPortalNotification)}, |
| (...skipping 1442 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 2319 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; | 2309 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; |
| 2320 | 2310 |
| 2321 const FeatureEntry* GetFeatureEntries(size_t* count) { | 2311 const FeatureEntry* GetFeatureEntries(size_t* count) { |
| 2322 *count = arraysize(kFeatureEntries); | 2312 *count = arraysize(kFeatureEntries); |
| 2323 return kFeatureEntries; | 2313 return kFeatureEntries; |
| 2324 } | 2314 } |
| 2325 | 2315 |
| 2326 } // namespace testing | 2316 } // namespace testing |
| 2327 | 2317 |
| 2328 } // namespace about_flags | 2318 } // namespace about_flags |
| OLD | NEW |