| Index: chrome/browser/supervised_user/supervised_user_pref_store.cc
|
| diff --git a/chrome/browser/supervised_user/supervised_user_pref_store.cc b/chrome/browser/supervised_user/supervised_user_pref_store.cc
|
| index 5d0dab4fab865be001d04e005ee4303afa394757..a7e9d1e922839a790265c35f6c00b994acd763c4 100644
|
| --- a/chrome/browser/supervised_user/supervised_user_pref_store.cc
|
| +++ b/chrome/browser/supervised_user/supervised_user_pref_store.cc
|
| @@ -36,16 +36,16 @@ SupervisedUserSettingsPrefMappingEntry kSupervisedUserSettingsPrefMapping[] = {
|
| prefs::kSupervisedUserManualURLs,
|
| },
|
| {
|
| - supervised_users::kForceSafeSearch,
|
| - prefs::kForceSafeSearch,
|
| + supervised_users::kForceSafeSearch, prefs::kForceSafeSearch,
|
| },
|
| {
|
| - supervised_users::kSigninAllowed,
|
| - prefs::kSigninAllowed,
|
| + supervised_users::kRecordHistory, prefs::kRecordHistory,
|
| },
|
| {
|
| - supervised_users::kUserName,
|
| - prefs::kProfileName,
|
| + supervised_users::kSigninAllowed, prefs::kSigninAllowed,
|
| + },
|
| + {
|
| + supervised_users::kUserName, prefs::kProfileName,
|
| },
|
| };
|
|
|
| @@ -95,6 +95,7 @@ void SupervisedUserPrefStore::OnNewSettingsAvailable(
|
| prefs_->SetValue(prefs::kDefaultSupervisedUserFilteringBehavior,
|
| new FundamentalValue(SupervisedUserURLFilter::ALLOW));
|
| prefs_->SetValue(prefs::kForceSafeSearch, new FundamentalValue(true));
|
| + prefs_->SetValue(prefs::kRecordHistory, new FundamentalValue(true));
|
| prefs_->SetValue(prefs::kHideWebStoreIcon, new FundamentalValue(true));
|
| prefs_->SetValue(prefs::kIncognitoModeAvailability,
|
| new FundamentalValue(IncognitoModePrefs::DISABLED));
|
|
|