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

Unified Diff: chrome/browser/supervised_user/supervised_user_pref_store.cc

Issue 480513004: Stopping the history recording for a supervised user (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Wrapped RecordHistory in a pref. 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 side-by-side diff with in-line comments
Download patch
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..067a364fb723e3f7255a8c2e6394d28fc1bdeb60 100644
--- a/chrome/browser/supervised_user/supervised_user_pref_store.cc
+++ b/chrome/browser/supervised_user/supervised_user_pref_store.cc
@@ -23,30 +23,30 @@ struct SupervisedUserSettingsPrefMappingEntry {
};
SupervisedUserSettingsPrefMappingEntry kSupervisedUserSettingsPrefMapping[] = {
- {
- supervised_users::kContentPackDefaultFilteringBehavior,
- prefs::kDefaultSupervisedUserFilteringBehavior,
- },
- {
- supervised_users::kContentPackManualBehaviorHosts,
- prefs::kSupervisedUserManualHosts,
- },
- {
- supervised_users::kContentPackManualBehaviorURLs,
- prefs::kSupervisedUserManualURLs,
- },
- {
- supervised_users::kForceSafeSearch,
- prefs::kForceSafeSearch,
- },
- {
- supervised_users::kSigninAllowed,
- prefs::kSigninAllowed,
- },
- {
- supervised_users::kUserName,
- prefs::kProfileName,
- },
+ {
Marc Treib 2014/08/20 14:14:26 Does the formatting change come from git cl format
fhorschig 2014/08/20 14:48:03 Indeed, it was. Changed it back.
+ supervised_users::kContentPackDefaultFilteringBehavior,
+ prefs::kDefaultSupervisedUserFilteringBehavior,
+ },
+ {
+ supervised_users::kContentPackManualBehaviorHosts,
+ prefs::kSupervisedUserManualHosts,
+ },
+ {
+ supervised_users::kContentPackManualBehaviorURLs,
+ prefs::kSupervisedUserManualURLs,
+ },
+ {
+ supervised_users::kForceSafeSearch, prefs::kForceSafeSearch,
+ },
+ {
+ supervised_users::kRecordHistory, prefs::kRecordHistory,
+ },
+ {
+ supervised_users::kSigninAllowed, prefs::kSigninAllowed,
+ },
+ {
+ supervised_users::kUserName, prefs::kProfileName,
+ },
};
} // namespace
@@ -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));

Powered by Google App Engine
This is Rietveld 408576698