Commit a58d996e authored by Marc Treib's avatar Marc Treib Committed by Commit Bot

Deprecate prefs::kSupervisedUserCreationAllowed

It was used to back a policy which was removed in
https://crrev.com/c/1224033, and supervised user creation itself has
been gone for way longer.

Bug: 828890
Change-Id: I3a764e88f72599799263d1dc141d88e5e8b85a91
Reviewed-on: https://chromium-review.googlesource.com/1245708Reviewed-by: default avatarDominic Battré <battre@chromium.org>
Commit-Queue: Marc Treib <treib@chromium.org>
Cr-Commit-Position: refs/heads/master@{#594715}
parent 140fb2db
...@@ -369,6 +369,8 @@ const char kTrustedDownloadSources[] = "trusted_download_sources"; ...@@ -369,6 +369,8 @@ const char kTrustedDownloadSources[] = "trusted_download_sources";
#if defined(OS_WIN) #if defined(OS_WIN)
const char kLastWelcomedOSVersion[] = "browser.last_welcomed_os_version"; const char kLastWelcomedOSVersion[] = "browser.last_welcomed_os_version";
#endif #endif
const char kSupervisedUserCreationAllowed[] =
"profile.managed_user_creation_allowed";
// Register prefs used only for migration (clearing or moving to a new key). // Register prefs used only for migration (clearing or moving to a new key).
void RegisterProfilePrefsForMigration( void RegisterProfilePrefsForMigration(
...@@ -392,6 +394,7 @@ void RegisterProfilePrefsForMigration( ...@@ -392,6 +394,7 @@ void RegisterProfilePrefsForMigration(
registry->RegisterIntegerPref(kModuleConflictBubbleShown, 0); registry->RegisterIntegerPref(kModuleConflictBubbleShown, 0);
registry->RegisterIntegerPref(kOptionsWindowLastTabIndex, 0); registry->RegisterIntegerPref(kOptionsWindowLastTabIndex, 0);
registry->RegisterStringPref(kTrustedDownloadSources, std::string()); registry->RegisterStringPref(kTrustedDownloadSources, std::string());
registry->RegisterBooleanPref(kSupervisedUserCreationAllowed, true);
} }
} // namespace } // namespace
...@@ -846,4 +849,5 @@ void MigrateObsoleteProfilePrefs(Profile* profile) { ...@@ -846,4 +849,5 @@ void MigrateObsoleteProfilePrefs(Profile* profile) {
profile_prefs->ClearPref(kModuleConflictBubbleShown); profile_prefs->ClearPref(kModuleConflictBubbleShown);
profile_prefs->ClearPref(kOptionsWindowLastTabIndex); profile_prefs->ClearPref(kOptionsWindowLastTabIndex);
profile_prefs->ClearPref(kTrustedDownloadSources); profile_prefs->ClearPref(kTrustedDownloadSources);
profile_prefs->ClearPref(kSupervisedUserCreationAllowed);
} }
...@@ -151,7 +151,6 @@ void SupervisedUserService::RegisterProfilePrefs( ...@@ -151,7 +151,6 @@ void SupervisedUserService::RegisterProfilePrefs(
registry->RegisterDictionaryPref(prefs::kSupervisedUserManualURLs); registry->RegisterDictionaryPref(prefs::kSupervisedUserManualURLs);
registry->RegisterIntegerPref(prefs::kDefaultSupervisedUserFilteringBehavior, registry->RegisterIntegerPref(prefs::kDefaultSupervisedUserFilteringBehavior,
SupervisedUserURLFilter::ALLOW); SupervisedUserURLFilter::ALLOW);
registry->RegisterBooleanPref(prefs::kSupervisedUserCreationAllowed, true);
registry->RegisterBooleanPref(prefs::kSupervisedUserSafeSites, true); registry->RegisterBooleanPref(prefs::kSupervisedUserSafeSites, true);
for (const char* pref : kCustodianInfoPrefs) { for (const char* pref : kCustodianInfoPrefs) {
registry->RegisterStringPref(pref, std::string()); registry->RegisterStringPref(pref, std::string());
......
...@@ -1185,10 +1185,6 @@ const char kPrintingSizeDefault[] = "printing.size_default"; ...@@ -1185,10 +1185,6 @@ const char kPrintingSizeDefault[] = "printing.size_default";
const char kDefaultSupervisedUserFilteringBehavior[] = const char kDefaultSupervisedUserFilteringBehavior[] =
"profile.managed.default_filtering_behavior"; "profile.managed.default_filtering_behavior";
// Whether this user is permitted to create supervised users.
const char kSupervisedUserCreationAllowed[] =
"profile.managed_user_creation_allowed";
// List pref containing the users supervised by this user. // List pref containing the users supervised by this user.
const char kSupervisedUsers[] = "profile.managed_users"; const char kSupervisedUsers[] = "profile.managed_users";
......
...@@ -399,7 +399,6 @@ extern const char kPrintingSizeDefault[]; ...@@ -399,7 +399,6 @@ extern const char kPrintingSizeDefault[];
extern const char kDefaultSupervisedUserFilteringBehavior[]; extern const char kDefaultSupervisedUserFilteringBehavior[];
extern const char kSupervisedUserCreationAllowed[];
extern const char kSupervisedUsers[]; extern const char kSupervisedUsers[];
extern const char kMessageCenterDisabledExtensionIds[]; extern const char kMessageCenterDisabledExtensionIds[];
......
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