chrome/browser/supervised_user/supervised_user_pref_store.cc - Issue 697693004: Supervised users: if history recording is off, allow incognito and deleting history

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 697693004: Supervised users: if history recording is off, allow incognito and deleting history (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: rebase Created 6 years, 1 month 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

« no previous file with comments | « chrome/browser/supervised_user/supervised_user_constants.cc ('k') | chrome/browser/supervised_user/supervised_user_pref_store_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 3f981d42b5c9a80a9aefde2afa66fc2763fab959..63f55ab638d2724187f1dac9f39f40a76914e7d9 100644

--- a/chrome/browser/supervised_user/supervised_user_pref_store.cc

+++ b/chrome/browser/supervised_user/supervised_user_pref_store.cc

@@ -26,6 +26,10 @@ struct SupervisedUserSettingsPrefMappingEntry {

SupervisedUserSettingsPrefMappingEntry kSupervisedUserSettingsPrefMapping[] = {

{

+ supervised_users::kAllowDeletingBrowserHistory,

+ prefs::kAllowDeletingBrowserHistory,

+ },

+ {

supervised_users::kContentPackDefaultFilteringBehavior,

prefs::kDefaultSupervisedUserFilteringBehavior,

@@ -41,6 +45,10 @@ SupervisedUserSettingsPrefMappingEntry kSupervisedUserSettingsPrefMapping[] = {

supervised_users::kForceSafeSearch, prefs::kForceSafeSearch,

{

+ supervised_users::kIncognitoModeAvailability,

+ prefs::kIncognitoModeAvailability,

+ },

+ {

supervised_users::kRecordHistory, prefs::kRecordHistory,

{