| 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 707 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 862 IDS_FLAGS_TOP_CHROME_MD_DESCRIPTION, kOsDesktop, | 862 IDS_FLAGS_TOP_CHROME_MD_DESCRIPTION, kOsDesktop, |
| 863 MULTI_VALUE_TYPE(kTopChromeMaterialDesignChoices)}, | 863 MULTI_VALUE_TYPE(kTopChromeMaterialDesignChoices)}, |
| 864 {"enable-site-settings", IDS_FLAGS_SITE_SETTINGS, | 864 {"enable-site-settings", IDS_FLAGS_SITE_SETTINGS, |
| 865 IDS_FLAGS_SITE_SETTINGS_DESCRIPTION, kOsDesktop, | 865 IDS_FLAGS_SITE_SETTINGS_DESCRIPTION, kOsDesktop, |
| 866 SINGLE_VALUE_TYPE(switches::kEnableSiteSettings)}, | 866 SINGLE_VALUE_TYPE(switches::kEnableSiteSettings)}, |
| 867 {"secondary-ui-md", IDS_FLAGS_SECONDARY_UI_MD, | 867 {"secondary-ui-md", IDS_FLAGS_SECONDARY_UI_MD, |
| 868 IDS_FLAGS_SECONDARY_UI_MD_DESCRIPTION, kOsDesktop, | 868 IDS_FLAGS_SECONDARY_UI_MD_DESCRIPTION, kOsDesktop, |
| 869 SINGLE_VALUE_TYPE(switches::kExtendMdToSecondaryUi)}, | 869 SINGLE_VALUE_TYPE(switches::kExtendMdToSecondaryUi)}, |
| 870 {"touch-events", IDS_FLAGS_TOUCH_EVENTS_NAME, | 870 {"touch-events", IDS_FLAGS_TOUCH_EVENTS_NAME, |
| 871 IDS_FLAGS_TOUCH_EVENTS_DESCRIPTION, kOsDesktop, | 871 IDS_FLAGS_TOUCH_EVENTS_DESCRIPTION, kOsDesktop, |
| 872 MULTI_VALUE_TYPE(kTouchEventsChoices)}, | 872 MULTI_VALUE_TYPE(kTouchEventFeatureDetectionChoices)}, |
| 873 {"disable-touch-adjustment", IDS_FLAGS_TOUCH_ADJUSTMENT_NAME, | 873 {"disable-touch-adjustment", IDS_FLAGS_TOUCH_ADJUSTMENT_NAME, |
| 874 IDS_FLAGS_TOUCH_ADJUSTMENT_DESCRIPTION, | 874 IDS_FLAGS_TOUCH_ADJUSTMENT_DESCRIPTION, |
| 875 kOsWin | kOsLinux | kOsCrOS | kOsAndroid, | 875 kOsWin | kOsLinux | kOsCrOS | kOsAndroid, |
| 876 SINGLE_DISABLE_VALUE_TYPE(switches::kDisableTouchAdjustment)}, | 876 SINGLE_DISABLE_VALUE_TYPE(switches::kDisableTouchAdjustment)}, |
| 877 #if defined(OS_CHROMEOS) | 877 #if defined(OS_CHROMEOS) |
| 878 {"network-portal-notification", IDS_FLAGS_NETWORK_PORTAL_NOTIFICATION_NAME, | 878 {"network-portal-notification", IDS_FLAGS_NETWORK_PORTAL_NOTIFICATION_NAME, |
| 879 IDS_FLAGS_NETWORK_PORTAL_NOTIFICATION_DESCRIPTION, kOsCrOS, | 879 IDS_FLAGS_NETWORK_PORTAL_NOTIFICATION_DESCRIPTION, kOsCrOS, |
| 880 ENABLE_DISABLE_VALUE_TYPE( | 880 ENABLE_DISABLE_VALUE_TYPE( |
| 881 chromeos::switches::kEnableNetworkPortalNotification, | 881 chromeos::switches::kEnableNetworkPortalNotification, |
| 882 chromeos::switches::kDisableNetworkPortalNotification)}, | 882 chromeos::switches::kDisableNetworkPortalNotification)}, |
| (...skipping 1441 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2324 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; | 2324 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; |
| 2325 | 2325 |
| 2326 const FeatureEntry* GetFeatureEntries(size_t* count) { | 2326 const FeatureEntry* GetFeatureEntries(size_t* count) { |
| 2327 *count = arraysize(kFeatureEntries); | 2327 *count = arraysize(kFeatureEntries); |
| 2328 return kFeatureEntries; | 2328 return kFeatureEntries; |
| 2329 } | 2329 } |
| 2330 | 2330 |
| 2331 } // namespace testing | 2331 } // namespace testing |
| 2332 | 2332 |
| 2333 } // namespace about_flags | 2333 } // namespace about_flags |
| OLD | NEW |