Commit 4e403504 authored by treib@chromium.org's avatar treib@chromium.org

Supervised users: Add prefs for custodian profile URLs.

BUG=372381

Review URL: https://codereview.chromium.org/466723003

Cr-Commit-Position: refs/heads/master@{#288999}
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@288999 0039d316-1c4b-4281-b951-d872f2087c98
parent 737f352e
...@@ -194,6 +194,9 @@ void SupervisedUserService::RegisterProfilePrefs( ...@@ -194,6 +194,9 @@ void SupervisedUserService::RegisterProfilePrefs(
registry->RegisterStringPref( registry->RegisterStringPref(
prefs::kSupervisedUserCustodianProfileImageURL, std::string(), prefs::kSupervisedUserCustodianProfileImageURL, std::string(),
user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
registry->RegisterStringPref(
prefs::kSupervisedUserCustodianProfileURL, std::string(),
user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
registry->RegisterStringPref( registry->RegisterStringPref(
prefs::kSupervisedUserSecondCustodianEmail, std::string(), prefs::kSupervisedUserSecondCustodianEmail, std::string(),
user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
...@@ -203,6 +206,9 @@ void SupervisedUserService::RegisterProfilePrefs( ...@@ -203,6 +206,9 @@ void SupervisedUserService::RegisterProfilePrefs(
registry->RegisterStringPref( registry->RegisterStringPref(
prefs::kSupervisedUserSecondCustodianProfileImageURL, std::string(), prefs::kSupervisedUserSecondCustodianProfileImageURL, std::string(),
user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
registry->RegisterStringPref(
prefs::kSupervisedUserSecondCustodianProfileURL, std::string(),
user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
registry->RegisterBooleanPref(prefs::kSupervisedUserCreationAllowed, true, registry->RegisterBooleanPref(prefs::kSupervisedUserCreationAllowed, true,
user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
} }
......
...@@ -96,6 +96,11 @@ const char kSupervisedUserCustodianName[] = "profile.managed.custodian_name"; ...@@ -96,6 +96,11 @@ const char kSupervisedUserCustodianName[] = "profile.managed.custodian_name";
const char kSupervisedUserCustodianProfileImageURL[] = const char kSupervisedUserCustodianProfileImageURL[] =
"profile.managed.custodian_profile_image_url"; "profile.managed.custodian_profile_image_url";
// Stores the URL of the profile associated with the google account of the
// custodian of the supervised user.
const char kSupervisedUserCustodianProfileURL[] =
"profile.managed.custodian_profile_url";
// Maps host names to whether the host is manually allowed or blocked. // Maps host names to whether the host is manually allowed or blocked.
const char kSupervisedUserManualHosts[] = "profile.managed.manual_hosts"; const char kSupervisedUserManualHosts[] = "profile.managed.manual_hosts";
...@@ -118,6 +123,11 @@ const char kSupervisedUserSecondCustodianName[] = ...@@ -118,6 +123,11 @@ const char kSupervisedUserSecondCustodianName[] =
const char kSupervisedUserSecondCustodianProfileImageURL[] = const char kSupervisedUserSecondCustodianProfileImageURL[] =
"profile.managed.second_custodian_profile_image_url"; "profile.managed.second_custodian_profile_image_url";
// Stores the URL of the profile associated with the google account of the
// secondary custodian of the supervised user.
const char kSupervisedUserSecondCustodianProfileURL[] =
"profile.managed.second_custodian_profile_url";
// Stores settings that can be modified both by a supervised user and their // Stores settings that can be modified both by a supervised user and their
// manager. See SupervisedUserSharedSettingsService for a description of // manager. See SupervisedUserSharedSettingsService for a description of
// the format. // the format.
......
...@@ -36,11 +36,13 @@ extern const char kSessionExitType[]; ...@@ -36,11 +36,13 @@ extern const char kSessionExitType[];
extern const char kSupervisedUserCustodianEmail[]; extern const char kSupervisedUserCustodianEmail[];
extern const char kSupervisedUserCustodianName[]; extern const char kSupervisedUserCustodianName[];
extern const char kSupervisedUserCustodianProfileImageURL[]; extern const char kSupervisedUserCustodianProfileImageURL[];
extern const char kSupervisedUserCustodianProfileURL[];
extern const char kSupervisedUserManualHosts[]; extern const char kSupervisedUserManualHosts[];
extern const char kSupervisedUserManualURLs[]; extern const char kSupervisedUserManualURLs[];
extern const char kSupervisedUserSecondCustodianEmail[]; extern const char kSupervisedUserSecondCustodianEmail[];
extern const char kSupervisedUserSecondCustodianName[]; extern const char kSupervisedUserSecondCustodianName[];
extern const char kSupervisedUserSecondCustodianProfileImageURL[]; extern const char kSupervisedUserSecondCustodianProfileImageURL[];
extern const char kSupervisedUserSecondCustodianProfileURL[];
extern const char kSupervisedUserSharedSettings[]; extern const char kSupervisedUserSharedSettings[];
extern const char kURLsToRestoreOnStartup[]; extern const char kURLsToRestoreOnStartup[];
extern const char kURLsToRestoreOnStartupOld[]; extern const char kURLsToRestoreOnStartupOld[];
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment