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 <algorithm> | 7 #include <algorithm> |
8 #include <iterator> | 8 #include <iterator> |
9 #include <map> | 9 #include <map> |
10 #include <set> | 10 #include <set> |
(...skipping 1116 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1127 ENABLE_DISABLE_VALUE_TYPE( | 1127 ENABLE_DISABLE_VALUE_TYPE( |
1128 ash::switches::kAshEnableAlternateFrameCaptionButtonStyle, | 1128 ash::switches::kAshEnableAlternateFrameCaptionButtonStyle, |
1129 ash::switches::kAshDisableAlternateFrameCaptionButtonStyle), | 1129 ash::switches::kAshDisableAlternateFrameCaptionButtonStyle), |
1130 }, | 1130 }, |
1131 { "ash-enable-touch-view-testing", | 1131 { "ash-enable-touch-view-testing", |
1132 IDS_FLAGS_ASH_ENABLE_TOUCH_VIEW_TESTING_NAME, | 1132 IDS_FLAGS_ASH_ENABLE_TOUCH_VIEW_TESTING_NAME, |
1133 IDS_FLAGS_ASH_ENABLE_TOUCH_VIEW_TESTING_DESCRIPTION, | 1133 IDS_FLAGS_ASH_ENABLE_TOUCH_VIEW_TESTING_DESCRIPTION, |
1134 kOsCrOS, | 1134 kOsCrOS, |
1135 SINGLE_VALUE_TYPE(ash::switches::kAshEnableTouchViewTesting), | 1135 SINGLE_VALUE_TYPE(ash::switches::kAshEnableTouchViewTesting), |
1136 }, | 1136 }, |
| 1137 { |
| 1138 "ash-enable-brightness-control", |
| 1139 IDS_FLAGS_ASH_ENABLE_BRIGHTNESS_CONTROL_NAME, |
| 1140 IDS_FLAGS_ASH_ENABLE_BRIGHTNESS_CONTROL_DESCRIPTION, |
| 1141 kOsCrOS, |
| 1142 SINGLE_VALUE_TYPE(ash::switches::kAshEnableBrightnessControl) |
| 1143 }, |
1137 #endif | 1144 #endif |
1138 #if defined(OS_CHROMEOS) | 1145 #if defined(OS_CHROMEOS) |
1139 { | 1146 { |
1140 "enable-carrier-switching", | 1147 "enable-carrier-switching", |
1141 IDS_FLAGS_ENABLE_CARRIER_SWITCHING, | 1148 IDS_FLAGS_ENABLE_CARRIER_SWITCHING, |
1142 IDS_FLAGS_ENABLE_CARRIER_SWITCHING_DESCRIPTION, | 1149 IDS_FLAGS_ENABLE_CARRIER_SWITCHING_DESCRIPTION, |
1143 kOsCrOS, | 1150 kOsCrOS, |
1144 SINGLE_VALUE_TYPE(chromeos::switches::kEnableCarrierSwitching) | 1151 SINGLE_VALUE_TYPE(chromeos::switches::kEnableCarrierSwitching) |
1145 }, | 1152 }, |
1146 { | 1153 { |
(...skipping 1247 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2394 } | 2401 } |
2395 | 2402 |
2396 const Experiment* GetExperiments(size_t* count) { | 2403 const Experiment* GetExperiments(size_t* count) { |
2397 *count = num_experiments; | 2404 *count = num_experiments; |
2398 return experiments; | 2405 return experiments; |
2399 } | 2406 } |
2400 | 2407 |
2401 } // namespace testing | 2408 } // namespace testing |
2402 | 2409 |
2403 } // namespace about_flags | 2410 } // namespace about_flags |
OLD | NEW |