| 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 117 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 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 kTouchEventsChoices[] = { |
| 138 { IDS_GENERIC_EXPERIMENT_CHOICE_ENABLED, "", "" }, | 138 { IDS_GENERIC_EXPERIMENT_CHOICE_AUTOMATIC, "", "" }, |
| 139 { IDS_GENERIC_EXPERIMENT_CHOICE_DISABLED, switches::kTouchEvents, | 139 { IDS_GENERIC_EXPERIMENT_CHOICE_ENABLED, |
| 140 switches::kTouchEventsDisabled }, | 140 switches::kTouchEvents, |
| 141 { IDS_GENERIC_EXPERIMENT_CHOICE_AUTOMATIC, switches::kTouchEvents, | 141 switches::kTouchEventsEnabled }, |
| 142 switches::kTouchEventsAuto } | 142 { IDS_GENERIC_EXPERIMENT_CHOICE_DISABLED, |
| 143 switches::kTouchEvents, |
| 144 switches::kTouchEventsDisabled } |
| 143 }; | 145 }; |
| 144 | 146 |
| 145 #if defined(USE_AURA) | 147 #if defined(USE_AURA) |
| 146 const FeatureEntry::Choice kOverscrollHistoryNavigationChoices[] = { | 148 const FeatureEntry::Choice kOverscrollHistoryNavigationChoices[] = { |
| 147 { IDS_GENERIC_EXPERIMENT_CHOICE_ENABLED, "", "" }, | 149 { IDS_GENERIC_EXPERIMENT_CHOICE_ENABLED, "", "" }, |
| 148 { IDS_GENERIC_EXPERIMENT_CHOICE_DISABLED, | 150 { IDS_GENERIC_EXPERIMENT_CHOICE_DISABLED, |
| 149 switches::kOverscrollHistoryNavigation, | 151 switches::kOverscrollHistoryNavigation, |
| 150 "0" }, | 152 "0" }, |
| 151 { IDS_OVERSCROLL_HISTORY_NAVIGATION_SIMPLE_UI, | 153 { IDS_OVERSCROLL_HISTORY_NAVIGATION_SIMPLE_UI, |
| 152 switches::kOverscrollHistoryNavigation, | 154 switches::kOverscrollHistoryNavigation, |
| (...skipping 2150 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2303 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; | 2305 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; |
| 2304 | 2306 |
| 2305 const FeatureEntry* GetFeatureEntries(size_t* count) { | 2307 const FeatureEntry* GetFeatureEntries(size_t* count) { |
| 2306 *count = arraysize(kFeatureEntries); | 2308 *count = arraysize(kFeatureEntries); |
| 2307 return kFeatureEntries; | 2309 return kFeatureEntries; |
| 2308 } | 2310 } |
| 2309 | 2311 |
| 2310 } // namespace testing | 2312 } // namespace testing |
| 2311 | 2313 |
| 2312 } // namespace about_flags | 2314 } // namespace about_flags |
| OLD | NEW |