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 1109 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1120 }, | 1120 }, |
1121 { | 1121 { |
1122 "enable-supervised-user-blacklist", | 1122 "enable-supervised-user-blacklist", |
1123 IDS_FLAGS_ENABLE_SUPERVISED_USER_BLACKLIST_NAME, | 1123 IDS_FLAGS_ENABLE_SUPERVISED_USER_BLACKLIST_NAME, |
1124 IDS_FLAGS_ENABLE_SUPERVISED_USER_BLACKLIST_DESCRIPTION, | 1124 IDS_FLAGS_ENABLE_SUPERVISED_USER_BLACKLIST_DESCRIPTION, |
1125 kOsAndroid | kOsMac | kOsWin | kOsLinux | kOsCrOS, | 1125 kOsAndroid | kOsMac | kOsWin | kOsLinux | kOsCrOS, |
1126 ENABLE_DISABLE_VALUE_TYPE(switches::kEnableSupervisedUserBlacklist, | 1126 ENABLE_DISABLE_VALUE_TYPE(switches::kEnableSupervisedUserBlacklist, |
1127 switches::kDisableSupervisedUserBlacklist) | 1127 switches::kDisableSupervisedUserBlacklist) |
1128 }, | 1128 }, |
1129 { | 1129 { |
| 1130 "enable-supervised-user-managed-bookmarks-folder", |
| 1131 IDS_FLAGS_ENABLE_SUPERVISED_USER_MANAGED_BOOKMARKS_FOLDER_NAME, |
| 1132 IDS_FLAGS_ENABLE_SUPERVISED_USER_MANAGED_BOOKMARKS_FOLDER_DESCRIPTION, |
| 1133 kOsAndroid | kOsMac | kOsWin | kOsLinux | kOsCrOS, |
| 1134 SINGLE_VALUE_TYPE(switches::kEnableSupervisedUserManagedBookmarksFolder) |
| 1135 }, |
| 1136 { |
1130 "enable-supervised-user-safesites", | 1137 "enable-supervised-user-safesites", |
1131 IDS_FLAGS_ENABLE_SUPERVISED_USER_SAFESITES_NAME, | 1138 IDS_FLAGS_ENABLE_SUPERVISED_USER_SAFESITES_NAME, |
1132 IDS_FLAGS_ENABLE_SUPERVISED_USER_SAFESITES_DESCRIPTION, | 1139 IDS_FLAGS_ENABLE_SUPERVISED_USER_SAFESITES_DESCRIPTION, |
1133 kOsAndroid | kOsMac | kOsWin | kOsLinux | kOsCrOS, | 1140 kOsAndroid | kOsMac | kOsWin | kOsLinux | kOsCrOS, |
1134 ENABLE_DISABLE_VALUE_TYPE(switches::kEnableSupervisedUserSafeSites, | 1141 ENABLE_DISABLE_VALUE_TYPE(switches::kEnableSupervisedUserSafeSites, |
1135 switches::kDisableSupervisedUserSafeSites) | 1142 switches::kDisableSupervisedUserSafeSites) |
1136 }, | 1143 }, |
1137 #if defined(ENABLE_APP_LIST) | 1144 #if defined(ENABLE_APP_LIST) |
1138 { | 1145 { |
1139 "enable-sync-app-list", | 1146 "enable-sync-app-list", |
(...skipping 1579 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2719 } | 2726 } |
2720 | 2727 |
2721 const Experiment* GetExperiments(size_t* count) { | 2728 const Experiment* GetExperiments(size_t* count) { |
2722 *count = num_experiments; | 2729 *count = num_experiments; |
2723 return experiments; | 2730 return experiments; |
2724 } | 2731 } |
2725 | 2732 |
2726 } // namespace testing | 2733 } // namespace testing |
2727 | 2734 |
2728 } // namespace about_flags | 2735 } // namespace about_flags |
OLD | NEW |