[cros] Initial user image loading and repeated profile image loading fixes.

chrome/browser/chromeos/login/user_manager.h

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CHROME_BROWSER_CHROMEOS_LOGIN_USER_MANAGER_H_
 #define CHROME_BROWSER_CHROMEOS_LOGIN_USER_MANAGER_H_
 #pragma once
 
 #include <string>
 
@@ skipping 67 matching lines @@
   // Returns true if given display name is unique.
   bool IsDisplayNameUnique(const std::string& display_name) const;
 
   // Saves user's oauth token status in local state preferences.
   void SaveUserOAuthStatus(const std::string& username,
                            User::OAuthTokenStatus oauth_token_status);
 
   // Gets user's oauth token status in local state preferences.
   User::OAuthTokenStatus GetUserOAuthStatus(const std::string& username) const;
 
-  // Sets user image to the default image with index |image_index|, updates
-  // local state preferences and sends LOGIN_USER_IMAGE_CHANGED notification.
+  // Sets user image to the default image with index |image_index|, sends
+  // LOGIN_USER_IMAGE_CHANGED notification and updates Local State.
   void SaveUserDefaultImageIndex(const std::string& username, int image_index);
 
-  // Saves image to file, updates local state preferences and sends
-  // LOGIN_USER_IMAGE_CHANGED notification.
+  // Saves image to file, sends LOGIN_USER_IMAGE_CHANGED notification and
+  // updates Local State.
   void SaveUserImage(const std::string& username, const SkBitmap& image);
 
-  // Tries to load user image from disk and sets it for the user; updates local
-  // state preferences and sends LOGIN_USER_IMAGE_CHANGED notification.
+  // Tries to load user image from disk; if successful, sets it for the user,
+  // sends LOGIN_USER_IMAGE_CHANGED notification and updates Local State.
   void SaveUserImageFromFile(const std::string& username, const FilePath& path);
 
-  // Sets profile image as user image for |username|, updates local state
-  // preferences and sends LOGIN_USER_IMAGE_CHANGED notification.
-  // If the user is not logged-in or the last |DownloadProfileImage| call
-  // has failed, a default grey avatar will be used until the user logs in
-  // and profile image is downloaded successfuly.
+  // Sets profile image as user image for |username|, sends
+  // LOGIN_USER_IMAGE_CHANGED notification and updates Local State. If the user
+  // is not logged-in or the last |DownloadProfileImage| call has failed, a
+  // default grey avatar will be used until the user logs in and profile image
+  // is downloaded successfuly.
   void SaveUserImageFromProfileImage(const std::string& username);
 
   // Starts downloading the profile image for the logged-in user.
   // If user's image index is |kProfileImageIndex|, newly downloaded image
   // is immediately set as user's current picture.
   void DownloadProfileImage();
 
   // content::NotificationObserver implementation.
   virtual void Observe(int type,
                        const content::NotificationSource& source,
@@ skipping 51 matching lines @@
   void EnsureUsersLoaded();
 
   // Makes stub user the current logged-in user (for test paths).
   void StubUserLoggedIn();
 
   // Notifies on new user session.
   void NotifyOnLogin();
 
   // Sets one of the default images for the specified user and saves this
   // setting in local state.
+  // Does not send LOGIN_USER_IMAGE_CHANGED notification.
   void SetInitialUserImage(const std::string& username);
 
-  // Sets image for user |username|.
+  // Sets image for user |username| and sends LOGIN_USER_IMAGE_CHANGED
+  // notification unless this is a new user and image is set for the first time.
   void SetUserImage(const std::string& username,
                     int image_index,
                     const SkBitmap& image);
 
   // Saves image to file, updates local state preferences to given image index
   // and sends LOGIN_USER_IMAGE_CHANGED notification.
   void SaveUserImageInternal(const std::string& username,
                              int image_index,
                              const SkBitmap& image);
 
-  // Saves image to file with specified path. Runs on FILE thread.
-  // Posts task for saving image info to local state on UI thread.
+  // Saves image to file with specified path and sends LOGIN_USER_IMAGE_CHANGED
+  // notification. Runs on FILE thread. Posts task for saving image info to
+  // Local State on UI thread.
   void SaveImageToFile(const std::string& username,
                        const SkBitmap& image,
                        const FilePath& image_path,
                        int image_index);
 
   // Stores path to the image and its index in local state. Runs on UI thread.
   // If |is_async| is true, it has been posted from the FILE thread after
   // saving the image.
   void SaveImageToLocalState(const std::string& username,
                              const std::string& image_path,
@@ skipping 76 matching lines @@
 
   // Data URL for |downloaded_profile_image_|.
   std::string downloaded_profile_image_data_url_;
 
   DISALLOW_COPY_AND_ASSIGN(UserManager);
 };
 
 }  // namespace chromeos
 
 #endif  // CHROME_BROWSER_CHROMEOS_LOGIN_USER_MANAGER_H_