chrome/browser/extensions/api/settings_private/prefs_util.cc - Issue 1412813003: This CL replaces user_manager::UserID with AccountId.

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/extensions/api/settings_private/prefs_util.cc

Issue 1412813003: This CL replaces user_manager::UserID with AccountId. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@468875--Chrome-OS-handles-deletion-of-Gmail-account-poorly--Create-AccountID-structure-part2--user_names

Patch Set: Fix Win GN build. Created 5 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/extensions/api/file_system/file_system_apitest_chromeos.cc ('k') | chrome/browser/extensions/crx_installer_browsertest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/extensions/api/settings_private/prefs_util.cc

diff --git a/chrome/browser/extensions/api/settings_private/prefs_util.cc b/chrome/browser/extensions/api/settings_private/prefs_util.cc

index b2c8a3c419a173f9431025601c663a8693f8fed7..3cced57bcfaf16ba5d2b74577db82334582c1bcb 100644

--- a/chrome/browser/extensions/api/settings_private/prefs_util.cc

+++ b/chrome/browser/extensions/api/settings_private/prefs_util.cc

@@ -283,8 +283,8 @@ scoped_ptr<settings_private::PrefObject> PrefsUtil::GetPref(

settings_private::PolicySource::POLICY_SOURCE_OWNER;

pref_object->policy_enforcement =

settings_private::PolicyEnforcement::POLICY_ENFORCEMENT_ENFORCED;

- pref_object->policy_source_name.reset(

- new std::string(user_manager::UserManager::Get()->GetOwnerEmail()));

+ pref_object->policy_source_name.reset(new std::string(

+ user_manager::UserManager::Get()->GetOwnerAccountId().GetUserEmail()));

return pref_object.Pass();

}

#endif