| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "chrome/browser/chromeos/login/screens/user_image_screen.h" | 5 #include "chrome/browser/chromeos/login/screens/user_image_screen.h" |
| 6 | 6 |
| 7 #include <string> | 7 #include <string> |
| 8 | 8 |
| 9 #include "base/bind.h" | 9 #include "base/bind.h" |
| 10 #include "base/bind_helpers.h" | 10 #include "base/bind_helpers.h" |
| (...skipping 209 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 220 void UserImageScreen::PrepareToShow() { | 220 void UserImageScreen::PrepareToShow() { |
| 221 if (view_) | 221 if (view_) |
| 222 view_->PrepareToShow(); | 222 view_->PrepareToShow(); |
| 223 } | 223 } |
| 224 | 224 |
| 225 const user_manager::User* UserImageScreen::GetUser() { | 225 const user_manager::User* UserImageScreen::GetUser() { |
| 226 return user_manager::UserManager::Get()->GetLoggedInUser(); | 226 return user_manager::UserManager::Get()->GetLoggedInUser(); |
| 227 } | 227 } |
| 228 | 228 |
| 229 UserImageManager* UserImageScreen::GetUserImageManager() { | 229 UserImageManager* UserImageScreen::GetUserImageManager() { |
| 230 return ChromeUserManager::Get()->GetUserImageManager(GetUser()->email()); | 230 return ChromeUserManager::Get()->GetUserImageManager(GetUser()->GetUserID()); |
| 231 } | 231 } |
| 232 | 232 |
| 233 UserImageSyncObserver* UserImageScreen::GetSyncObserver() { | 233 UserImageSyncObserver* UserImageScreen::GetSyncObserver() { |
| 234 return GetUserImageManager()->GetSyncObserver(); | 234 return GetUserImageManager()->GetSyncObserver(); |
| 235 } | 235 } |
| 236 | 236 |
| 237 void UserImageScreen::Show() { | 237 void UserImageScreen::Show() { |
| 238 if (!view_) | 238 if (!view_) |
| 239 return; | 239 return; |
| 240 | 240 |
| (...skipping 112 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 353 | 353 |
| 354 void UserImageScreen::ReportSyncResult(SyncResult timed_out) const { | 354 void UserImageScreen::ReportSyncResult(SyncResult timed_out) const { |
| 355 base::TimeDelta duration = base::Time::Now() - sync_waiting_start_time_; | 355 base::TimeDelta duration = base::Time::Now() - sync_waiting_start_time_; |
| 356 UMA_HISTOGRAM_TIMES("Login.NewUserPriorityPrefsSyncTime", duration); | 356 UMA_HISTOGRAM_TIMES("Login.NewUserPriorityPrefsSyncTime", duration); |
| 357 UMA_HISTOGRAM_ENUMERATION("Login.NewUserPriorityPrefsSyncResult", | 357 UMA_HISTOGRAM_ENUMERATION("Login.NewUserPriorityPrefsSyncResult", |
| 358 static_cast<int>(timed_out), | 358 static_cast<int>(timed_out), |
| 359 static_cast<int>(SyncResult::COUNT)); | 359 static_cast<int>(SyncResult::COUNT)); |
| 360 } | 360 } |
| 361 | 361 |
| 362 } // namespace chromeos | 362 } // namespace chromeos |
| OLD | NEW |