chrome/browser/chromeos/preferences.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/chromeos/preferences.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: Update after review. Created 5 years, 2 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

« chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager.cc ('K') | « chrome/browser/chromeos/power/power_prefs_unittest.cc ('k') | chrome/browser/chromeos/preferences_chromeos_browsertest.cc » ('j') | chrome/browser/signin/chrome_signin_client.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/preferences.cc

diff --git a/chrome/browser/chromeos/preferences.cc b/chrome/browser/chromeos/preferences.cc

index b6ed2db50f8b6c2fe58cad12a26d7d25feb168d1..7e8a4b80a27cbe6497a65728396c6af8e42f419f 100644

--- a/chrome/browser/chromeos/preferences.cc

+++ b/chrome/browser/chromeos/preferences.cc

@@ -399,7 +399,8 @@ void Preferences::ApplyPreferences(ApplyReason reason,

const std::string& pref_name) {

DCHECK(reason != REASON_PREF_CHANGED || !pref_name.empty());

const bool user_is_owner =

- user_manager::UserManager::Get()->GetOwnerEmail() == user_->email();

+ user_manager::UserManager::Get()->GetOwnerAccountId() ==

+ user_->GetAccountId();

const bool user_is_active = user_->is_active();

system::TouchpadSettings touchpad_settings;

@@ -622,7 +623,7 @@ void Preferences::ApplyPreferences(ApplyReason reason,

reason != REASON_ACTIVE_USER_CHANGED) {

const bool value = prefs_->GetBoolean(prefs::kUse24HourClock);

user_manager::UserManager::Get()->SetKnownUserBooleanPref(

- user_->GetUserID(), prefs::kUse24HourClock, value);

+ user_->GetAccountId(), prefs::kUse24HourClock, value);

}