| 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 1087 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1098 ENABLE_DISABLE_VALUE_TYPE( | 1098 ENABLE_DISABLE_VALUE_TYPE( |
| 1099 ash::switches::kAshEnableAlternateFrameCaptionButtonStyle, | 1099 ash::switches::kAshEnableAlternateFrameCaptionButtonStyle, |
| 1100 ash::switches::kAshDisableAlternateFrameCaptionButtonStyle), | 1100 ash::switches::kAshDisableAlternateFrameCaptionButtonStyle), |
| 1101 }, | 1101 }, |
| 1102 { "ash-enable-touch-view-testing", | 1102 { "ash-enable-touch-view-testing", |
| 1103 IDS_FLAGS_ASH_ENABLE_TOUCH_VIEW_TESTING_NAME, | 1103 IDS_FLAGS_ASH_ENABLE_TOUCH_VIEW_TESTING_NAME, |
| 1104 IDS_FLAGS_ASH_ENABLE_TOUCH_VIEW_TESTING_DESCRIPTION, | 1104 IDS_FLAGS_ASH_ENABLE_TOUCH_VIEW_TESTING_DESCRIPTION, |
| 1105 kOsCrOS, | 1105 kOsCrOS, |
| 1106 SINGLE_VALUE_TYPE(ash::switches::kAshEnableTouchViewTesting), | 1106 SINGLE_VALUE_TYPE(ash::switches::kAshEnableTouchViewTesting), |
| 1107 }, | 1107 }, |
| 1108 { | |
| 1109 "ash-enable-brightness-control", | |
| 1110 IDS_FLAGS_ASH_ENABLE_BRIGHTNESS_CONTROL_NAME, | |
| 1111 IDS_FLAGS_ASH_ENABLE_BRIGHTNESS_CONTROL_DESCRIPTION, | |
| 1112 kOsCrOS, | |
| 1113 SINGLE_VALUE_TYPE(ash::switches::kAshEnableBrightnessControl) | |
| 1114 }, | |
| 1115 #endif | 1108 #endif |
| 1116 #if defined(OS_CHROMEOS) | 1109 #if defined(OS_CHROMEOS) |
| 1117 { | 1110 { |
| 1118 "enable-carrier-switching", | 1111 "enable-carrier-switching", |
| 1119 IDS_FLAGS_ENABLE_CARRIER_SWITCHING, | 1112 IDS_FLAGS_ENABLE_CARRIER_SWITCHING, |
| 1120 IDS_FLAGS_ENABLE_CARRIER_SWITCHING_DESCRIPTION, | 1113 IDS_FLAGS_ENABLE_CARRIER_SWITCHING_DESCRIPTION, |
| 1121 kOsCrOS, | 1114 kOsCrOS, |
| 1122 SINGLE_VALUE_TYPE(chromeos::switches::kEnableCarrierSwitching) | 1115 SINGLE_VALUE_TYPE(chromeos::switches::kEnableCarrierSwitching) |
| 1123 }, | 1116 }, |
| 1124 { | 1117 { |
| (...skipping 1246 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2371 } | 2364 } |
| 2372 | 2365 |
| 2373 const Experiment* GetExperiments(size_t* count) { | 2366 const Experiment* GetExperiments(size_t* count) { |
| 2374 *count = num_experiments; | 2367 *count = num_experiments; |
| 2375 return experiments; | 2368 return experiments; |
| 2376 } | 2369 } |
| 2377 | 2370 |
| 2378 } // namespace testing | 2371 } // namespace testing |
| 2379 | 2372 |
| 2380 } // namespace about_flags | 2373 } // namespace about_flags |
| OLD | NEW |