chrome/browser/supervised_user/supervised_user_settings_service.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_settings_service.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: fix browser_tests 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

« chrome/browser/supervised_user/supervised_user_constants.h ('K') | « chrome/browser/supervised_user/supervised_user_settings_service.h ('k') | chrome/browser/supervised_user/supervised_user_settings_service_unittest.cc » ('j') | chrome/browser/ui/toolbar/wrench_menu_model.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/supervised_user/supervised_user_settings_service.cc

diff --git a/chrome/browser/supervised_user/supervised_user_settings_service.cc b/chrome/browser/supervised_user/supervised_user_settings_service.cc

index ef3207b1ee0fc70d72be65b55e2096f63bfc2dc3..f60a86d1882ab85d91a63f450fb282a3e0cacdf7 100644

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

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

@@ -135,7 +135,7 @@ void SupervisedUserSettingsService::UploadItem(const std::string& key,

dict->SetWithoutPathExpansion(key_suffix, value.release());

}

-void SupervisedUserSettingsService::SetLocalSettingForTesting(

+void SupervisedUserSettingsService::SetLocalSetting(

const std::string& key,

scoped_ptr<base::Value> value) {

if (value)