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 1078 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1089 }, | 1089 }, |
1090 { | 1090 { |
1091 "enable-supervised-user-blacklist", | 1091 "enable-supervised-user-blacklist", |
1092 IDS_FLAGS_ENABLE_SUPERVISED_USER_BLACKLIST_NAME, | 1092 IDS_FLAGS_ENABLE_SUPERVISED_USER_BLACKLIST_NAME, |
1093 IDS_FLAGS_ENABLE_SUPERVISED_USER_BLACKLIST_DESCRIPTION, | 1093 IDS_FLAGS_ENABLE_SUPERVISED_USER_BLACKLIST_DESCRIPTION, |
1094 kOsAndroid | kOsMac | kOsWin | kOsLinux | kOsCrOS, | 1094 kOsAndroid | kOsMac | kOsWin | kOsLinux | kOsCrOS, |
1095 ENABLE_DISABLE_VALUE_TYPE(switches::kEnableSupervisedUserBlacklist, | 1095 ENABLE_DISABLE_VALUE_TYPE(switches::kEnableSupervisedUserBlacklist, |
1096 switches::kDisableSupervisedUserBlacklist) | 1096 switches::kDisableSupervisedUserBlacklist) |
1097 }, | 1097 }, |
1098 { | 1098 { |
| 1099 "enable-supervised-user-managed-bookmarks-folder", |
| 1100 IDS_FLAGS_ENABLE_SUPERVISED_USER_MANAGED_BOOKMARKS_FOLDER_NAME, |
| 1101 IDS_FLAGS_ENABLE_SUPERVISED_USER_MANAGED_BOOKMARKS_FOLDER_DESCRIPTION, |
| 1102 kOsAndroid | kOsMac | kOsWin | kOsLinux | kOsCrOS, |
| 1103 SINGLE_VALUE_TYPE(switches::kEnableSupervisedUserManagedBookmarksFolder) |
| 1104 }, |
| 1105 { |
1099 "enable-supervised-user-safesites", | 1106 "enable-supervised-user-safesites", |
1100 IDS_FLAGS_ENABLE_SUPERVISED_USER_SAFESITES_NAME, | 1107 IDS_FLAGS_ENABLE_SUPERVISED_USER_SAFESITES_NAME, |
1101 IDS_FLAGS_ENABLE_SUPERVISED_USER_SAFESITES_DESCRIPTION, | 1108 IDS_FLAGS_ENABLE_SUPERVISED_USER_SAFESITES_DESCRIPTION, |
1102 kOsAndroid | kOsMac | kOsWin | kOsLinux | kOsCrOS, | 1109 kOsAndroid | kOsMac | kOsWin | kOsLinux | kOsCrOS, |
1103 ENABLE_DISABLE_VALUE_TYPE(switches::kEnableSupervisedUserSafeSites, | 1110 ENABLE_DISABLE_VALUE_TYPE(switches::kEnableSupervisedUserSafeSites, |
1104 switches::kDisableSupervisedUserSafeSites) | 1111 switches::kDisableSupervisedUserSafeSites) |
1105 }, | 1112 }, |
1106 #if defined(ENABLE_APP_LIST) | 1113 #if defined(ENABLE_APP_LIST) |
1107 { | 1114 { |
1108 "enable-sync-app-list", | 1115 "enable-sync-app-list", |
(...skipping 1560 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2669 } | 2676 } |
2670 | 2677 |
2671 const Experiment* GetExperiments(size_t* count) { | 2678 const Experiment* GetExperiments(size_t* count) { |
2672 *count = num_experiments; | 2679 *count = num_experiments; |
2673 return experiments; | 2680 return experiments; |
2674 } | 2681 } |
2675 | 2682 |
2676 } // namespace testing | 2683 } // namespace testing |
2677 | 2684 |
2678 } // namespace about_flags | 2685 } // namespace about_flags |
OLD | NEW |