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

Unified Diff: chrome/browser/chromeos/login/user_image_manager_impl.cc

Issue 23095006: If user profile doesn't contain language setting, default to his Google account settings. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix tests. Created 7 years, 3 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/login/user.cc ('k') | chrome/browser/chromeos/login/user_manager.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chromeos/login/user_image_manager_impl.cc
diff --git a/chrome/browser/chromeos/login/user_image_manager_impl.cc b/chrome/browser/chromeos/login/user_image_manager_impl.cc
index 005c75f2759a2668324a3f69f948e8e9c38783d1..93ddf9d92595f0df4a689af3f2b7f335156ca00a 100644
--- a/chrome/browser/chromeos/login/user_image_manager_impl.cc
+++ b/chrome/browser/chromeos/login/user_image_manager_impl.cc
@@ -659,10 +659,9 @@ void UserImageManagerImpl::OnProfileDownloadSuccess(
UserManager* user_manager = UserManager::Get();
const User* user = user_manager->GetLoggedInUser();
- if (!downloader->GetProfileFullName().empty()) {
- user_manager->SaveUserDisplayName(
- user->email(), downloader->GetProfileFullName());
- }
+ user_manager->UpdateUserAccountData(user->email(),
+ downloader->GetProfileFullName(),
+ downloader->GetProfileLocale());
bool requested_image = downloading_profile_image_;
downloading_profile_image_ = false;
@@ -743,6 +742,12 @@ void UserImageManagerImpl::OnProfileDownloadFailure(
AddProfileImageTimeHistogram(kDownloadFailure, profile_image_download_reason_,
delta);
+ UserManager* user_manager = UserManager::Get();
+ const User* user = user_manager->GetLoggedInUser();
+
+ // Need note that at least one attempt finished.
+ user_manager->UpdateUserAccountData(user->email(), string16(), "");
+
// Retry download after some time if a network error has occured.
if (reason == ProfileDownloaderDelegate::NETWORK_ERROR) {
BrowserThread::PostDelayedTask(
« no previous file with comments | « chrome/browser/chromeos/login/user.cc ('k') | chrome/browser/chromeos/login/user_manager.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698