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 1143 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1154 IDS_FLAGS_ENABLE_SUGGESTIONS_SERVICE_DESCRIPTION, | 1154 IDS_FLAGS_ENABLE_SUGGESTIONS_SERVICE_DESCRIPTION, |
1155 kOsAndroid | kOsCrOS, | 1155 kOsAndroid | kOsCrOS, |
1156 ENABLE_DISABLE_VALUE_TYPE(switches::kEnableSuggestionsService, | 1156 ENABLE_DISABLE_VALUE_TYPE(switches::kEnableSuggestionsService, |
1157 switches::kDisableSuggestionsService) | 1157 switches::kDisableSuggestionsService) |
1158 }, | 1158 }, |
1159 { | 1159 { |
1160 "enable-supervised-user-blacklist", | 1160 "enable-supervised-user-blacklist", |
1161 IDS_FLAGS_ENABLE_SUPERVISED_USER_BLACKLIST_NAME, | 1161 IDS_FLAGS_ENABLE_SUPERVISED_USER_BLACKLIST_NAME, |
1162 IDS_FLAGS_ENABLE_SUPERVISED_USER_BLACKLIST_DESCRIPTION, | 1162 IDS_FLAGS_ENABLE_SUPERVISED_USER_BLACKLIST_DESCRIPTION, |
1163 kOsAndroid | kOsMac | kOsWin | kOsLinux | kOsCrOS, | 1163 kOsAndroid | kOsMac | kOsWin | kOsLinux | kOsCrOS, |
1164 SINGLE_VALUE_TYPE(switches::kEnableSupervisedUserBlacklist) | 1164 ENABLE_DISABLE_VALUE_TYPE(switches::kEnableSupervisedUserBlacklist, |
| 1165 switches::kDisableSupervisedUserBlacklist) |
1165 }, | 1166 }, |
1166 { | 1167 { |
1167 "enable-sync-synced-notifications", | 1168 "enable-sync-synced-notifications", |
1168 IDS_FLAGS_ENABLE_SYNCED_NOTIFICATIONS_NAME, | 1169 IDS_FLAGS_ENABLE_SYNCED_NOTIFICATIONS_NAME, |
1169 IDS_FLAGS_ENABLE_SYNCED_NOTIFICATIONS_DESCRIPTION, | 1170 IDS_FLAGS_ENABLE_SYNCED_NOTIFICATIONS_DESCRIPTION, |
1170 kOsDesktop, | 1171 kOsDesktop, |
1171 ENABLE_DISABLE_VALUE_TYPE(switches::kEnableSyncSyncedNotifications, | 1172 ENABLE_DISABLE_VALUE_TYPE(switches::kEnableSyncSyncedNotifications, |
1172 switches::kDisableSyncSyncedNotifications) | 1173 switches::kDisableSyncSyncedNotifications) |
1173 }, | 1174 }, |
1174 #if defined(ENABLE_APP_LIST) | 1175 #if defined(ENABLE_APP_LIST) |
(...skipping 1350 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2525 } | 2526 } |
2526 | 2527 |
2527 const Experiment* GetExperiments(size_t* count) { | 2528 const Experiment* GetExperiments(size_t* count) { |
2528 *count = num_experiments; | 2529 *count = num_experiments; |
2529 return experiments; | 2530 return experiments; |
2530 } | 2531 } |
2531 | 2532 |
2532 } // namespace testing | 2533 } // namespace testing |
2533 | 2534 |
2534 } // namespace about_flags | 2535 } // namespace about_flags |
OLD | NEW |