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 1118 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1129 SINGLE_VALUE_TYPE(chromeos::switches::kDisableBootAnimation), | 1129 SINGLE_VALUE_TYPE(chromeos::switches::kDisableBootAnimation), |
1130 }, | 1130 }, |
1131 { | 1131 { |
1132 "captive-portal-detector", | 1132 "captive-portal-detector", |
1133 IDS_FLAGS_CAPTIVE_PORTAL_DETECTOR_NAME, | 1133 IDS_FLAGS_CAPTIVE_PORTAL_DETECTOR_NAME, |
1134 IDS_FLAGS_CAPTIVE_PORTAL_DETECTOR_DESCRIPTION, | 1134 IDS_FLAGS_CAPTIVE_PORTAL_DETECTOR_DESCRIPTION, |
1135 kOsCrOSOwnerOnly, | 1135 kOsCrOSOwnerOnly, |
1136 MULTI_VALUE_TYPE(kChromeCaptivePortalDetectionChoices), | 1136 MULTI_VALUE_TYPE(kChromeCaptivePortalDetectionChoices), |
1137 }, | 1137 }, |
1138 { | 1138 { |
1139 "disable-new-lock-animations", | |
1140 IDS_FLAGS_ASH_NEW_LOCK_ANIMATIONS, | |
1141 IDS_FLAGS_ASH_NEW_LOCK_ANIMATIONS_DESCRIPTION, | |
1142 kOsCrOS, | |
1143 SINGLE_VALUE_TYPE(ash::switches::kAshDisableNewLockAnimations), | |
1144 }, | |
1145 { | |
1146 "file-manager-show-checkboxes", | 1139 "file-manager-show-checkboxes", |
1147 IDS_FLAGS_FILE_MANAGER_SHOW_CHECKBOXES_NAME, | 1140 IDS_FLAGS_FILE_MANAGER_SHOW_CHECKBOXES_NAME, |
1148 IDS_FLAGS_FILE_MANAGER_SHOW_CHECKBOXES_DESCRIPTION, | 1141 IDS_FLAGS_FILE_MANAGER_SHOW_CHECKBOXES_DESCRIPTION, |
1149 kOsCrOS, | 1142 kOsCrOS, |
1150 SINGLE_VALUE_TYPE(chromeos::switches::kFileManagerShowCheckboxes) | 1143 SINGLE_VALUE_TYPE(chromeos::switches::kFileManagerShowCheckboxes) |
1151 }, | 1144 }, |
1152 { | 1145 { |
1153 "file-manager-enable-webstore-integration", | 1146 "file-manager-enable-webstore-integration", |
1154 IDS_FLAGS_FILE_MANAGER_ENABLE_WEBSTORE_INTEGRATION, | 1147 IDS_FLAGS_FILE_MANAGER_ENABLE_WEBSTORE_INTEGRATION, |
1155 IDS_FLAGS_FILE_MANAGER_ENABLE_WEBSTORE_INTEGRATION_DESCRIPTION, | 1148 IDS_FLAGS_FILE_MANAGER_ENABLE_WEBSTORE_INTEGRATION_DESCRIPTION, |
(...skipping 1102 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2258 } | 2251 } |
2259 | 2252 |
2260 const Experiment* GetExperiments(size_t* count) { | 2253 const Experiment* GetExperiments(size_t* count) { |
2261 *count = num_experiments; | 2254 *count = num_experiments; |
2262 return experiments; | 2255 return experiments; |
2263 } | 2256 } |
2264 | 2257 |
2265 } // namespace testing | 2258 } // namespace testing |
2266 | 2259 |
2267 } // namespace about_flags | 2260 } // namespace about_flags |
OLD | NEW |