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 1086 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1097 }, | 1097 }, |
1098 { | 1098 { |
1099 "enable-supervised-user-blacklist", | 1099 "enable-supervised-user-blacklist", |
1100 IDS_FLAGS_ENABLE_SUPERVISED_USER_BLACKLIST_NAME, | 1100 IDS_FLAGS_ENABLE_SUPERVISED_USER_BLACKLIST_NAME, |
1101 IDS_FLAGS_ENABLE_SUPERVISED_USER_BLACKLIST_DESCRIPTION, | 1101 IDS_FLAGS_ENABLE_SUPERVISED_USER_BLACKLIST_DESCRIPTION, |
1102 kOsAndroid | kOsMac | kOsWin | kOsLinux | kOsCrOS, | 1102 kOsAndroid | kOsMac | kOsWin | kOsLinux | kOsCrOS, |
1103 ENABLE_DISABLE_VALUE_TYPE(switches::kEnableSupervisedUserBlacklist, | 1103 ENABLE_DISABLE_VALUE_TYPE(switches::kEnableSupervisedUserBlacklist, |
1104 switches::kDisableSupervisedUserBlacklist) | 1104 switches::kDisableSupervisedUserBlacklist) |
1105 }, | 1105 }, |
1106 { | 1106 { |
| 1107 "enable-supervised-user-managed-bookmarks-folder", |
| 1108 IDS_FLAGS_ENABLE_SUPERVISED_USER_MANAGED_BOOKMARKS_FOLDER_NAME, |
| 1109 IDS_FLAGS_ENABLE_SUPERVISED_USER_MANAGED_BOOKMARKS_FOLDER_DESCRIPTION, |
| 1110 kOsAndroid | kOsMac | kOsWin | kOsLinux | kOsCrOS, |
| 1111 SINGLE_VALUE_TYPE(switches::kEnableSupervisedUserManagedBookmarksFolder) |
| 1112 }, |
| 1113 { |
1107 "enable-supervised-user-safesites", | 1114 "enable-supervised-user-safesites", |
1108 IDS_FLAGS_ENABLE_SUPERVISED_USER_SAFESITES_NAME, | 1115 IDS_FLAGS_ENABLE_SUPERVISED_USER_SAFESITES_NAME, |
1109 IDS_FLAGS_ENABLE_SUPERVISED_USER_SAFESITES_DESCRIPTION, | 1116 IDS_FLAGS_ENABLE_SUPERVISED_USER_SAFESITES_DESCRIPTION, |
1110 kOsAndroid | kOsMac | kOsWin | kOsLinux | kOsCrOS, | 1117 kOsAndroid | kOsMac | kOsWin | kOsLinux | kOsCrOS, |
1111 ENABLE_DISABLE_VALUE_TYPE(switches::kEnableSupervisedUserSafeSites, | 1118 ENABLE_DISABLE_VALUE_TYPE(switches::kEnableSupervisedUserSafeSites, |
1112 switches::kDisableSupervisedUserSafeSites) | 1119 switches::kDisableSupervisedUserSafeSites) |
1113 }, | 1120 }, |
1114 #if defined(ENABLE_APP_LIST) | 1121 #if defined(ENABLE_APP_LIST) |
1115 { | 1122 { |
1116 "enable-sync-app-list", | 1123 "enable-sync-app-list", |
(...skipping 1574 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2691 } | 2698 } |
2692 | 2699 |
2693 const Experiment* GetExperiments(size_t* count) { | 2700 const Experiment* GetExperiments(size_t* count) { |
2694 *count = num_experiments; | 2701 *count = num_experiments; |
2695 return experiments; | 2702 return experiments; |
2696 } | 2703 } |
2697 | 2704 |
2698 } // namespace testing | 2705 } // namespace testing |
2699 | 2706 |
2700 } // namespace about_flags | 2707 } // namespace about_flags |
OLD | NEW |