Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(255)

Side by Side Diff: chrome/browser/about_flags.cc

Issue 769153007: Managed bookmarks for supervised users (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Android fix; rebase Created 5 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 1119 matching lines...) Expand 10 before | Expand all | Expand 10 after
1130 }, 1130 },
1131 { 1131 {
1132 "enable-supervised-user-blacklist", 1132 "enable-supervised-user-blacklist",
1133 IDS_FLAGS_ENABLE_SUPERVISED_USER_BLACKLIST_NAME, 1133 IDS_FLAGS_ENABLE_SUPERVISED_USER_BLACKLIST_NAME,
1134 IDS_FLAGS_ENABLE_SUPERVISED_USER_BLACKLIST_DESCRIPTION, 1134 IDS_FLAGS_ENABLE_SUPERVISED_USER_BLACKLIST_DESCRIPTION,
1135 kOsAndroid | kOsMac | kOsWin | kOsLinux | kOsCrOS, 1135 kOsAndroid | kOsMac | kOsWin | kOsLinux | kOsCrOS,
1136 ENABLE_DISABLE_VALUE_TYPE(switches::kEnableSupervisedUserBlacklist, 1136 ENABLE_DISABLE_VALUE_TYPE(switches::kEnableSupervisedUserBlacklist,
1137 switches::kDisableSupervisedUserBlacklist) 1137 switches::kDisableSupervisedUserBlacklist)
1138 }, 1138 },
1139 { 1139 {
1140 "enable-supervised-user-managed-bookmarks-folder",
1141 IDS_FLAGS_ENABLE_SUPERVISED_USER_MANAGED_BOOKMARKS_FOLDER_NAME,
1142 IDS_FLAGS_ENABLE_SUPERVISED_USER_MANAGED_BOOKMARKS_FOLDER_DESCRIPTION,
1143 kOsAndroid | kOsMac | kOsWin | kOsLinux | kOsCrOS,
1144 SINGLE_VALUE_TYPE(switches::kEnableSupervisedUserManagedBookmarksFolder)
1145 },
1146 {
1140 "enable-supervised-user-safesites", 1147 "enable-supervised-user-safesites",
1141 IDS_FLAGS_ENABLE_SUPERVISED_USER_SAFESITES_NAME, 1148 IDS_FLAGS_ENABLE_SUPERVISED_USER_SAFESITES_NAME,
1142 IDS_FLAGS_ENABLE_SUPERVISED_USER_SAFESITES_DESCRIPTION, 1149 IDS_FLAGS_ENABLE_SUPERVISED_USER_SAFESITES_DESCRIPTION,
1143 kOsAndroid | kOsMac | kOsWin | kOsLinux | kOsCrOS, 1150 kOsAndroid | kOsMac | kOsWin | kOsLinux | kOsCrOS,
1144 ENABLE_DISABLE_VALUE_TYPE(switches::kEnableSupervisedUserSafeSites, 1151 ENABLE_DISABLE_VALUE_TYPE(switches::kEnableSupervisedUserSafeSites,
1145 switches::kDisableSupervisedUserSafeSites) 1152 switches::kDisableSupervisedUserSafeSites)
1146 }, 1153 },
1147 #if defined(ENABLE_APP_LIST) 1154 #if defined(ENABLE_APP_LIST)
1148 { 1155 {
1149 "enable-sync-app-list", 1156 "enable-sync-app-list",
(...skipping 1572 matching lines...) Expand 10 before | Expand all | Expand 10 after
2722 } 2729 }
2723 2730
2724 const Experiment* GetExperiments(size_t* count) { 2731 const Experiment* GetExperiments(size_t* count) {
2725 *count = num_experiments; 2732 *count = num_experiments;
2726 return experiments; 2733 return experiments;
2727 } 2734 }
2728 2735
2729 } // namespace testing 2736 } // namespace testing
2730 2737
2731 } // namespace about_flags 2738 } // namespace about_flags
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698