chrome/browser/supervised_user/supervised_user_whitelist_service.cc - Issue 2843813002: Remove SetWithoutPathExpansion

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_whitelist_service.cc

Issue 2843813002: Remove SetWithoutPathExpansion (Closed)

Patch Set: Fix CrOS Error Created 3 years, 8 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

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

Index: chrome/browser/supervised_user/supervised_user_whitelist_service.cc

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

index eb334018320468660fd4fab2068b730f2458b355..901fa2efd6e25e62584a2dd7037b0b02510fdb1f 100644

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

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

@@ -7,9 +7,11 @@

#include <stddef.h>

#include <string>

+#include <utility>

#include "base/command_line.h"

#include "base/files/file_path.h"

+#include "base/memory/ptr_util.h"

#include "base/metrics/histogram_macros.h"

#include "base/metrics/user_metrics.h"

#include "base/metrics/user_metrics_action.h"

@@ -282,7 +284,7 @@ void SupervisedUserWhitelistService::AddNewWhitelist(

RegisterWhitelist(whitelist.id(), whitelist.name(), FROM_SYNC);

std::unique_ptr<base::DictionaryValue> dict(new base::DictionaryValue);

SetWhitelistProperties(dict.get(), whitelist);

- pref_dict->SetWithoutPathExpansion(whitelist.id(), dict.release());

+ pref_dict->SetWithoutPathExpansion(whitelist.id(), std::move(dict));

}

void SupervisedUserWhitelistService::SetWhitelistProperties(