chrome/browser/chromeos/preferences.cc - Issue 1425093004: Revert of 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 1425093004: Revert of 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: 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

« no previous file with comments | « chrome/browser/chromeos/power/power_prefs_unittest.cc ('k') | chrome/browser/chromeos/preferences_chromeos_browsertest.cc » ('j') | no next file with comments »
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 c5336f74914ac586cf60107a51233745ec12419a..d32f60a670f2f8e4a283ba2636f0f828cb30970b 100644

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

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

@@ -400,8 +400,7 @@

const std::string& pref_name) {

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

const bool user_is_owner =

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

- user_->GetAccountId();

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

const bool user_is_active = user_->is_active();

system::TouchpadSettings touchpad_settings;

@@ -626,7 +625,7 @@

reason != REASON_ACTIVE_USER_CHANGED) {

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

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

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

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

}