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

Side by Side Diff: chrome/common/pref_names.cc

Issue 316863002: Rename "managed (mode|user)" to "supervised user" (part 1) (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 6 years, 6 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 | Annotate | Revision Log
« no previous file with comments | « chrome/common/pref_names.h ('k') | chrome/common/url_constants.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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/common/pref_names.h" 5 #include "chrome/common/pref_names.h"
6 6
7 #include "base/basictypes.h" 7 #include "base/basictypes.h"
8 #include "chrome/common/pref_font_webkit_names.h" 8 #include "chrome/common/pref_font_webkit_names.h"
9 9
10 namespace prefs { 10 namespace prefs {
(...skipping 16 matching lines...) Expand all
27 // handling code reads local state, while extension APIs use profile pref. 27 // handling code reads local state, while extension APIs use profile pref.
28 const char kDisableScreenshots[] = "disable_screenshots"; 28 const char kDisableScreenshots[] = "disable_screenshots";
29 29
30 // A boolean specifying whether the New Tab page is the home page or not. 30 // A boolean specifying whether the New Tab page is the home page or not.
31 const char kHomePageIsNewTabPage[] = "homepage_is_newtabpage"; 31 const char kHomePageIsNewTabPage[] = "homepage_is_newtabpage";
32 32
33 // This is the URL of the page to load when opening new tabs. 33 // This is the URL of the page to load when opening new tabs.
34 const char kHomePage[] = "homepage"; 34 const char kHomePage[] = "homepage";
35 35
36 // Maps host names to whether the host is manually allowed or blocked. 36 // Maps host names to whether the host is manually allowed or blocked.
37 const char kManagedModeManualHosts[] = "profile.managed.manual_hosts"; 37 const char kSupervisedUserManualHosts[] = "profile.managed.manual_hosts";
38 // Maps URLs to whether the URL is manually allowed or blocked. 38 // Maps URLs to whether the URL is manually allowed or blocked.
39 const char kManagedModeManualURLs[] = "profile.managed.manual_urls"; 39 const char kSupervisedUserManualURLs[] = "profile.managed.manual_urls";
40 40
41 // Stores the email address associated with the google account of the custodian 41 // Stores the email address associated with the google account of the custodian
42 // of the managed user, set when the managed user is created. 42 // of the supervised user, set when the supervised user is created.
43 const char kManagedUserCustodianEmail[] = "profile.managed.custodian_email"; 43 const char kSupervisedUserCustodianEmail[] = "profile.managed.custodian_email";
44 44
45 // Stores the display name associated with the google account of the custodian 45 // Stores the display name associated with the google account of the custodian
46 // of the managed user, updated (if possible) each time the managed user 46 // of the supervised user, updated (if possible) each time the supervised user
47 // starts a session. 47 // starts a session.
48 const char kManagedUserCustodianName[] = "profile.managed.custodian_name"; 48 const char kSupervisedUserCustodianName[] = "profile.managed.custodian_name";
49 49
50 // Stores settings that can be modified both by a supervised user and their 50 // Stores settings that can be modified both by a supervised user and their
51 // manager. See ManagedUserSharedSettingsService for a description of 51 // manager. See ManagedUserSharedSettingsService for a description of
52 // the format. 52 // the format.
53 const char kManagedUserSharedSettings[] = "profile.managed.shared_settings"; 53 const char kSupervisedUserSharedSettings[] = "profile.managed.shared_settings";
54 54
55 // An integer that keeps track of the profile icon version. This allows us to 55 // An integer that keeps track of the profile icon version. This allows us to
56 // determine the state of the profile icon for icon format changes. 56 // determine the state of the profile icon for icon format changes.
57 const char kProfileIconVersion[] = "profile.icon_version"; 57 const char kProfileIconVersion[] = "profile.icon_version";
58 58
59 // Used to determine if the last session exited cleanly. Set to false when 59 // Used to determine if the last session exited cleanly. Set to false when
60 // first opened, and to true when closing. On startup if the value is false, 60 // first opened, and to true when closing. On startup if the value is false,
61 // it means the profile didn't exit cleanly. 61 // it means the profile didn't exit cleanly.
62 // DEPRECATED: this is replaced by kSessionExitType and exists for backwards 62 // DEPRECATED: this is replaced by kSessionExitType and exists for backwards
63 // compatibility. 63 // compatibility.
(...skipping 1100 matching lines...) Expand 10 before | Expand all | Expand 10 after
1164 const char kImportSearchEngine[] = "import_search_engine"; 1164 const char kImportSearchEngine[] = "import_search_engine";
1165 1165
1166 // Boolean that specifies whether to import the saved passwords from the default 1166 // Boolean that specifies whether to import the saved passwords from the default
1167 // browser on first run. 1167 // browser on first run.
1168 const char kImportSavedPasswords[] = "import_saved_passwords"; 1168 const char kImportSavedPasswords[] = "import_saved_passwords";
1169 1169
1170 // Profile avatar and name 1170 // Profile avatar and name
1171 const char kProfileAvatarIndex[] = "profile.avatar_index"; 1171 const char kProfileAvatarIndex[] = "profile.avatar_index";
1172 const char kProfileName[] = "profile.name"; 1172 const char kProfileName[] = "profile.name";
1173 1173
1174 // Whether the profile is managed. 1174 // Whether the profile is supervised. Deprecated, use kSupervisedUserId below.
1175 const char kProfileIsManaged[] = "profile.is_managed"; 1175 const char kProfileIsSupervised[] = "profile.is_managed";
1176 1176
1177 // The managed user ID. 1177 // The supervised user ID.
1178 const char kManagedUserId[] = "profile.managed_user_id"; 1178 const char kSupervisedUserId[] = "profile.managed_user_id";
1179 1179
1180 // 64-bit integer serialization of the base::Time when the user's GAIA info 1180 // 64-bit integer serialization of the base::Time when the user's GAIA info
1181 // was last updated. 1181 // was last updated.
1182 const char kProfileGAIAInfoUpdateTime[] = "profile.gaia_info_update_time"; 1182 const char kProfileGAIAInfoUpdateTime[] = "profile.gaia_info_update_time";
1183 1183
1184 // The URL from which the GAIA profile picture was downloaded. This is cached to 1184 // The URL from which the GAIA profile picture was downloaded. This is cached to
1185 // prevent the same picture from being downloaded multiple times. 1185 // prevent the same picture from being downloaded multiple times.
1186 const char kProfileGAIAInfoPictureURL[] = "profile.gaia_info_picture_url"; 1186 const char kProfileGAIAInfoPictureURL[] = "profile.gaia_info_picture_url";
1187 1187
1188 // Integer that specifies the number of times that we have shown the tutorial 1188 // Integer that specifies the number of times that we have shown the tutorial
(...skipping 13 matching lines...) Expand all
1202 const char kPrintingEnabled[] = "printing.enabled"; 1202 const char kPrintingEnabled[] = "printing.enabled";
1203 1203
1204 // Boolean controlling whether print preview is disabled. 1204 // Boolean controlling whether print preview is disabled.
1205 const char kPrintPreviewDisabled[] = "printing.print_preview_disabled"; 1205 const char kPrintPreviewDisabled[] = "printing.print_preview_disabled";
1206 1206
1207 // An integer pref specifying the fallback behavior for sites outside of content 1207 // An integer pref specifying the fallback behavior for sites outside of content
1208 // packs. One of: 1208 // packs. One of:
1209 // 0: Allow (does nothing) 1209 // 0: Allow (does nothing)
1210 // 1: Warn. 1210 // 1: Warn.
1211 // 2: Block. 1211 // 2: Block.
1212 const char kDefaultManagedModeFilteringBehavior[] = 1212 const char kDefaultSupervisedUserFilteringBehavior[] =
1213 "profile.managed.default_filtering_behavior"; 1213 "profile.managed.default_filtering_behavior";
1214 1214
1215 // Whether this user is permitted to create managed users. 1215 // Whether this user is permitted to create supervised users.
1216 const char kManagedUserCreationAllowed[] = 1216 const char kSupervisedUserCreationAllowed[] =
1217 "profile.managed_user_creation_allowed"; 1217 "profile.managed_user_creation_allowed";
1218 1218
1219 // List pref containing the users managed by this user. 1219 // List pref containing the users supervised by this user.
1220 const char kManagedUsers[] = "profile.managed_users"; 1220 const char kSupervisedUsers[] = "profile.managed_users";
1221 1221
1222 // List pref containing the extension ids which are not allowed to send 1222 // List pref containing the extension ids which are not allowed to send
1223 // notifications to the message center. 1223 // notifications to the message center.
1224 const char kMessageCenterDisabledExtensionIds[] = 1224 const char kMessageCenterDisabledExtensionIds[] =
1225 "message_center.disabled_extension_ids"; 1225 "message_center.disabled_extension_ids";
1226 1226
1227 // List pref containing the system component ids which are not allowed to send 1227 // List pref containing the system component ids which are not allowed to send
1228 // notifications to the message center. 1228 // notifications to the message center.
1229 const char kMessageCenterDisabledSystemComponentIds[] = 1229 const char kMessageCenterDisabledSystemComponentIds[] =
1230 "message_center.disabled_system_component_ids"; 1230 "message_center.disabled_system_component_ids";
(...skipping 1140 matching lines...) Expand 10 before | Expand all | Expand 10 after
2371 // "mapped_title" entries, detailing the bookmark target URL (if any), the title 2371 // "mapped_title" entries, detailing the bookmark target URL (if any), the title
2372 // given by the PartnerBookmarksProvider and either the user-visible renamed 2372 // given by the PartnerBookmarksProvider and either the user-visible renamed
2373 // title or an empty string if the bookmark node was removed. 2373 // title or an empty string if the bookmark node was removed.
2374 const char kPartnerBookmarkMappings[] = "partnerbookmarks.mappings"; 2374 const char kPartnerBookmarkMappings[] = "partnerbookmarks.mappings";
2375 #endif 2375 #endif
2376 2376
2377 // Whether DNS Quick Check is disabled in proxy resolution. 2377 // Whether DNS Quick Check is disabled in proxy resolution.
2378 const char kQuickCheckEnabled[] = "proxy.quick_check_enabled"; 2378 const char kQuickCheckEnabled[] = "proxy.quick_check_enabled";
2379 2379
2380 } // namespace prefs 2380 } // namespace prefs
OLDNEW
« no previous file with comments | « chrome/common/pref_names.h ('k') | chrome/common/url_constants.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698