diff options
| author | avayvod@chromium.org <avayvod@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-19 17:54:34 +0000 |
|---|---|---|
| committer | avayvod@chromium.org <avayvod@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-19 17:54:34 +0000 |
| commit | 25ce9fe1732a2940bea277b723c354349c5bb16d (patch) | |
| tree | 92084636854786fcc8e87a827168c7bbbf49d1b2 | |
| parent | 1942b575b71a56eb329591052d28d673e5cdb573 (diff) | |
| download | chromium_src-25ce9fe1732a2940bea277b723c354349c5bb16d.zip chromium_src-25ce9fe1732a2940bea277b723c354349c5bb16d.tar.gz chromium_src-25ce9fe1732a2940bea277b723c354349c5bb16d.tar.bz2 | |
Storing image of logged-in user after picture taking screen to be initialized during user session.
BUG=chromiumos:9253,chromiumos:7939
TEST=Verify that after taking user picture, it shows on screen locker and in Settings > Personal before user signs out.
Review URL: http://codereview.chromium.org/5197003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@66770 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/chromeos/login/user_image_screen.cc | 1 | ||||
| -rw-r--r-- | chrome/browser/chromeos/login/user_manager.cc | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/chrome/browser/chromeos/login/user_image_screen.cc b/chrome/browser/chromeos/login/user_image_screen.cc index 7151b4d..d4b67c4 100644 --- a/chrome/browser/chromeos/login/user_image_screen.cc +++ b/chrome/browser/chromeos/login/user_image_screen.cc @@ -124,6 +124,7 @@ void UserImageScreen::OnOK(const SkBitmap& image) { const UserManager::User& user = user_manager->logged_in_user(); DCHECK(!user.email().empty()); + user_manager->SetLoggedInUserImage(image); user_manager->SaveUserImage(user.email(), image); if (delegate()) delegate()->GetObserver(this)->OnExit(ScreenObserver::USER_IMAGE_SELECTED); diff --git a/chrome/browser/chromeos/login/user_manager.cc b/chrome/browser/chromeos/login/user_manager.cc index ada146e..1a6c6ef 100644 --- a/chrome/browser/chromeos/login/user_manager.cc +++ b/chrome/browser/chromeos/login/user_manager.cc @@ -251,6 +251,7 @@ void UserManager::UserLoggedIn(const std::string& email) { ListValue* prefs_users = prefs->GetMutableList(kLoggedInUsers); prefs_users->Clear(); + logged_in_user_ = User(); logged_in_user_.set_email(email); // Make sure this user is first. |