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 1152 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1163 }, | 1163 }, |
1164 { | 1164 { |
1165 "enable-suggestions-service", | 1165 "enable-suggestions-service", |
1166 IDS_FLAGS_ENABLE_SUGGESTIONS_SERVICE_NAME, | 1166 IDS_FLAGS_ENABLE_SUGGESTIONS_SERVICE_NAME, |
1167 IDS_FLAGS_ENABLE_SUGGESTIONS_SERVICE_DESCRIPTION, | 1167 IDS_FLAGS_ENABLE_SUGGESTIONS_SERVICE_DESCRIPTION, |
1168 kOsAndroid | kOsCrOS, | 1168 kOsAndroid | kOsCrOS, |
1169 ENABLE_DISABLE_VALUE_TYPE(switches::kEnableSuggestionsService, | 1169 ENABLE_DISABLE_VALUE_TYPE(switches::kEnableSuggestionsService, |
1170 switches::kDisableSuggestionsService) | 1170 switches::kDisableSuggestionsService) |
1171 }, | 1171 }, |
1172 { | 1172 { |
| 1173 "enable-supervised-user-blacklist", |
| 1174 IDS_FLAGS_ENABLE_SUPERVISED_USER_BLACKLIST_NAME, |
| 1175 IDS_FLAGS_ENABLE_SUPERVISED_USER_BLACKLIST_DESCRIPTION, |
| 1176 kOsAndroid | kOsMac | kOsWin | kOsLinux | kOsCrOS, |
| 1177 SINGLE_VALUE_TYPE(switches::kEnableSupervisedUserBlacklist) |
| 1178 }, |
| 1179 { |
1173 "enable-sync-synced-notifications", | 1180 "enable-sync-synced-notifications", |
1174 IDS_FLAGS_ENABLE_SYNCED_NOTIFICATIONS_NAME, | 1181 IDS_FLAGS_ENABLE_SYNCED_NOTIFICATIONS_NAME, |
1175 IDS_FLAGS_ENABLE_SYNCED_NOTIFICATIONS_DESCRIPTION, | 1182 IDS_FLAGS_ENABLE_SYNCED_NOTIFICATIONS_DESCRIPTION, |
1176 kOsDesktop, | 1183 kOsDesktop, |
1177 ENABLE_DISABLE_VALUE_TYPE(switches::kEnableSyncSyncedNotifications, | 1184 ENABLE_DISABLE_VALUE_TYPE(switches::kEnableSyncSyncedNotifications, |
1178 switches::kDisableSyncSyncedNotifications) | 1185 switches::kDisableSyncSyncedNotifications) |
1179 }, | 1186 }, |
1180 #if defined(ENABLE_APP_LIST) | 1187 #if defined(ENABLE_APP_LIST) |
1181 { | 1188 { |
1182 "enable-sync-app-list", | 1189 "enable-sync-app-list", |
(...skipping 1297 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2480 } | 2487 } |
2481 | 2488 |
2482 const Experiment* GetExperiments(size_t* count) { | 2489 const Experiment* GetExperiments(size_t* count) { |
2483 *count = num_experiments; | 2490 *count = num_experiments; |
2484 return experiments; | 2491 return experiments; |
2485 } | 2492 } |
2486 | 2493 |
2487 } // namespace testing | 2494 } // namespace testing |
2488 | 2495 |
2489 } // namespace about_flags | 2496 } // namespace about_flags |
OLD | NEW |