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

chrome/browser/chromeos/login/default_user_images.h

Index: chrome/browser/chromeos/login/default_user_images.h
diff --git a/chrome/browser/chromeos/login/default_user_images.h b/chrome/browser/chromeos/login/default_user_images.h
index b0a96e45b06e922771aec9d3d68c936386883cf8..1950a238a17e85a0fe0d3154e9cc995edbd78eed 100644
--- a/chrome/browser/chromeos/login/default_user_images.h
+++ b/chrome/browser/chromeos/login/default_user_images.h
@@ -9,23 +9,30 @@
 #include <cstddef>  // for size_t
 #include <string>
 
+class SkBitmap;
+
 namespace chromeos {
 
 // Returns path to default user image with specified index.
 // The path is used in Local State to distinguish default images.
+// This function is obsolete and is preserved only for compatibility with older
+// profiles which don't user separate image index and path.
 std::string GetDefaultImagePath(int index);
 
 // Checks if given path is one of the default ones. If it is, returns true
 // and its index through |image_id|. If not, returns false.
 bool IsDefaultImagePath(const std::string& path, int* image_id);
 
-// Returns URL to default user image with specifided index.
+// Returns URL to default user image with specified index.
 std::string GetDefaultImageUrl(int index);
 
 // Checks if the given URL points to one of the default images. If it is,
 // returns true and its index through |image_id|. If not, returns false.
 bool IsDefaultImageUrl(const std::string url, int* image_id);
 
+// Returns bitmap of default user image with specified index.
+const SkBitmap& GetDefaultImage(int index);
+
 // Resource IDs of default user images.
 extern const int kDefaultImageResources[];