Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(149)

Issues Search
    My Issues | Starred     Open | Closed | All

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: Rebased. 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/user_manager_unittest.cc ('K') | « chrome/browser/chromeos/power/power_prefs_unittest.cc ('k') | chrome/browser/chromeos/preferences_chromeos_browsertest.cc » ('j') | chrome/browser/chromeos/settings/device_settings_test_helper.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments 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..e5127a5cecc9a8c68f1b67320ac50502c4ae1f86 100644
--- a/chrome/browser/chromeos/preferences.cc
+++ b/chrome/browser/chromeos/preferences.cc
@@ -399,7 +399,7 @@ 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()->GetOwnerId() == user_->GetUserID();
const bool user_is_active = user_->is_active();
system::TouchpadSettings touchpad_settings;
« chrome/browser/chromeos/login/users/user_manager_unittest.cc ('K') | « chrome/browser/chromeos/power/power_prefs_unittest.cc ('k') | chrome/browser/chromeos/preferences_chromeos_browsertest.cc » ('j') | chrome/browser/chromeos/settings/device_settings_test_helper.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698