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

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

Issue 449543002: Supervised users: Add prefs for a secondary custodian, and for the custodian's profile image URL. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 4 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') | no next file » | 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 64 matching lines...) Expand 10 before | Expand all | Expand 10 after
75 const char kRestoreStartupURLsMigrationTime[] = 75 const char kRestoreStartupURLsMigrationTime[] =
76 "session.startup_urls_migration_time"; 76 "session.startup_urls_migration_time";
77 77
78 // The URLs to restore on startup or when the home button is pressed. The URLs 78 // The URLs to restore on startup or when the home button is pressed. The URLs
79 // are only restored on startup if kRestoreOnStartup is 4. 79 // are only restored on startup if kRestoreOnStartup is 4.
80 const char kURLsToRestoreOnStartup[] = "session.startup_urls"; 80 const char kURLsToRestoreOnStartup[] = "session.startup_urls";
81 81
82 // Old startup url pref name for kURLsToRestoreOnStartup. 82 // Old startup url pref name for kURLsToRestoreOnStartup.
83 const char kURLsToRestoreOnStartupOld[] = "session.urls_to_restore_on_startup"; 83 const char kURLsToRestoreOnStartupOld[] = "session.urls_to_restore_on_startup";
84 84
85 // Maps host names to whether the host is manually allowed or blocked.
86 const char kSupervisedUserManualHosts[] = "profile.managed.manual_hosts";
87 // Maps URLs to whether the URL is manually allowed or blocked.
88 const char kSupervisedUserManualURLs[] = "profile.managed.manual_urls";
89
90 // Stores the email address associated with the google account of the custodian 85 // Stores the email address associated with the google account of the custodian
91 // of the supervised user, set when the supervised user is created. 86 // of the supervised user, set when the supervised user is created.
92 const char kSupervisedUserCustodianEmail[] = "profile.managed.custodian_email"; 87 const char kSupervisedUserCustodianEmail[] = "profile.managed.custodian_email";
93 88
94 // Stores the display name associated with the google account of the custodian 89 // Stores the display name associated with the google account of the custodian
95 // of the supervised user, updated (if possible) each time the supervised user 90 // of the supervised user, updated (if possible) each time the supervised user
96 // starts a session. 91 // starts a session.
97 const char kSupervisedUserCustodianName[] = "profile.managed.custodian_name"; 92 const char kSupervisedUserCustodianName[] = "profile.managed.custodian_name";
98 93
94 // Stores the URL of the profile image associated with the google account of the
95 // custodian of the supervised user.
96 const char kSupervisedUserCustodianProfileImageURL[] =
97 "profile.managed.custodian_profile_image_url";
98
99 // Maps host names to whether the host is manually allowed or blocked.
100 const char kSupervisedUserManualHosts[] = "profile.managed.manual_hosts";
101
102 // Maps URLs to whether the URL is manually allowed or blocked.
103 const char kSupervisedUserManualURLs[] = "profile.managed.manual_urls";
104
105 // Stores the email address associated with the google account of the secondary
106 // custodian of the supervised user, set when the supervised user is created.
107 const char kSupervisedUserSecondCustodianEmail[] =
108 "profile.managed.second_custodian_email";
109
110 // Stores the display name associated with the google account of the secondary
111 // custodian of the supervised user, updated (if possible) each time the
112 // supervised user starts a session.
113 const char kSupervisedUserSecondCustodianName[] =
114 "profile.managed.second_custodian_name";
115
116 // Stores the URL of the profile image associated with the google account of the
117 // secondary custodian of the supervised user.
118 const char kSupervisedUserSecondCustodianProfileImageURL[] =
119 "profile.managed.second_custodian_profile_image_url";
120
99 // Stores settings that can be modified both by a supervised user and their 121 // Stores settings that can be modified both by a supervised user and their
100 // manager. See SupervisedUserSharedSettingsService for a description of 122 // manager. See SupervisedUserSharedSettingsService for a description of
101 // the format. 123 // the format.
102 const char kSupervisedUserSharedSettings[] = "profile.managed.shared_settings"; 124 const char kSupervisedUserSharedSettings[] = "profile.managed.shared_settings";
103 125
104 // The application locale. 126 // The application locale.
105 // For OS_CHROMEOS we maintain kApplicationLocale property in both local state 127 // For OS_CHROMEOS we maintain kApplicationLocale property in both local state
106 // and user's profile. Global property determines locale of login screen, 128 // and user's profile. Global property determines locale of login screen,
107 // while user's profile determines his personal locale preference. 129 // while user's profile determines his personal locale preference.
108 const char kApplicationLocale[] = "intl.app_locale"; 130 const char kApplicationLocale[] = "intl.app_locale";
(...skipping 2183 matching lines...) Expand 10 before | Expand all | Expand 10 after
2292 // "mapped_title" entries, detailing the bookmark target URL (if any), the title 2314 // "mapped_title" entries, detailing the bookmark target URL (if any), the title
2293 // given by the PartnerBookmarksProvider and either the user-visible renamed 2315 // given by the PartnerBookmarksProvider and either the user-visible renamed
2294 // title or an empty string if the bookmark node was removed. 2316 // title or an empty string if the bookmark node was removed.
2295 const char kPartnerBookmarkMappings[] = "partnerbookmarks.mappings"; 2317 const char kPartnerBookmarkMappings[] = "partnerbookmarks.mappings";
2296 #endif 2318 #endif
2297 2319
2298 // Whether DNS Quick Check is disabled in proxy resolution. 2320 // Whether DNS Quick Check is disabled in proxy resolution.
2299 const char kQuickCheckEnabled[] = "proxy.quick_check_enabled"; 2321 const char kQuickCheckEnabled[] = "proxy.quick_check_enabled";
2300 2322
2301 } // namespace prefs 2323 } // namespace prefs
OLDNEW
« no previous file with comments | « chrome/common/pref_names.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698