[cros] Define a range of stock user images availables for selection.

chrome/browser/ui/webui/options2/chromeos/change_picture_options_handler.cc

 // Copyright (c) 2012 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.
 
 #include "chrome/browser/ui/webui/options2/chromeos/change_picture_options_handler.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/command_line.h"
 #include "base/metrics/histogram.h"
@@ skipping 118 matching lines @@
   web_ui()->RegisterMessageCallback("onChangePicturePageInitialized",
       base::Bind(&ChangePictureOptionsHandler::HandlePageInitialized,
                  base::Unretained(this)));
   web_ui()->RegisterMessageCallback("selectImage",
       base::Bind(&ChangePictureOptionsHandler::HandleSelectImage,
                  base::Unretained(this)));
 }
 
 void ChangePictureOptionsHandler::SendDefaultImages() {
   ListValue image_urls;
-  for (int i = 0; i < kDefaultImagesCount; ++i) {
+  for (int i = kFirstDefaultImageIndex; i < kDefaultImagesCount; ++i) {
     image_urls.Append(new StringValue(GetDefaultImageUrl(i)));
   }
   web_ui()->CallJavascriptFunction("ChangePictureOptions.setDefaultImages",
                                    image_urls);
 }
 
 void ChangePictureOptionsHandler::HandleChooseFile(const ListValue* args) {
   DCHECK(args && args->empty());
   select_file_dialog_ = ui::SelectFileDialog::Create(
       this, new ChromeSelectFilePolicy(web_ui()->GetWebContents()));
@@ skipping 94 matching lines @@
       break;
     }
     case User::kProfileImageIndex: {
       // User has his/her Profile image as the current image.
       SendProfileImage(user.image(), true);
       break;
     }
     default: {
       DCHECK(previous_image_index_ >= 0 &&
              previous_image_index_ < kDefaultImagesCount);
-      // User has image from the set of default images.
-      base::StringValue image_url(GetDefaultImageUrl(previous_image_index_));
-      web_ui()->CallJavascriptFunction("ChangePictureOptions.setSelectedImage",
-                                       image_url);
+      if (previous_image_index_ >= kFirstDefaultImageIndex) {
+        // User has image from the current set of default images.
+        base::StringValue image_url(GetDefaultImageUrl(previous_image_index_));
+        web_ui()->CallJavascriptFunction(
+            "ChangePictureOptions.setSelectedImage", image_url);
+      } else {
+        // User has an old default image, so present it in the same manner as a
+        // previous image from file.
+        web_ui()->CallJavascriptFunction("ChangePictureOptions.setOldImage");
+      }
     }
   }
 }
 
 void ChangePictureOptionsHandler::SendProfileImage(const gfx::ImageSkia& image,
                                                    bool should_select) {
   base::StringValue data_url(web_ui_util::GetImageDataUrl(image));
   base::FundamentalValue select(should_select);
   web_ui()->CallJavascriptFunction("ChangePictureOptions.setProfileImage",
                                    data_url, select);
@@ skipping 20 matching lines @@
     return;
   }
   DCHECK(!image_url.empty());
 
   UserManager* user_manager = UserManager::Get();
   const User& user = user_manager->GetLoggedInUser();
   int image_index = User::kInvalidImageIndex;
   bool waiting_for_camera_photo = false;
 
   if (StartsWithASCII(image_url, chrome::kChromeUIUserImageURL, false)) {
-    // Image from file/camera uses kChromeUIUserImageURL as URL while
+    // Image from file/camera uses |kChromeUIUserImageURL| as URL while
     // current profile image always has a full data URL.
     // This way transition from (current profile image) to
     // (profile image, current image from file) is easier.
+    // Also, old (not available for selection any more) default images use
+    // this URL, too.
 
-    DCHECK(!previous_image_.empty());
-    user_manager->SaveUserImage(user.email(),
-                                UserImage::CreateAndEncode(previous_image_));
+    if (previous_image_index_ == User::kExternalImageIndex) {
+      DCHECK(!previous_image_.empty());
+      user_manager->SaveUserImage(user.email(),
+                                  UserImage::CreateAndEncode(previous_image_));
+    } else {
+      DCHECK(previous_image_index_ >= 0 &&
+             previous_image_index_ < kFirstDefaultImageIndex);
+      user_manager->SaveUserDefaultImageIndex(user.email(),
+                                              previous_image_index_);
+    }
 
     UMA_HISTOGRAM_ENUMERATION("UserImage.ChangeChoice",
                               kHistogramImageOld,
                               kHistogramImagesCount);
     VLOG(1) << "Selected old user image";
   } else if (IsDefaultImageUrl(image_url, &image_index)) {
     // One of the default user images.
     user_manager->SaveUserDefaultImageIndex(user.email(), image_index);
 
     UMA_HISTOGRAM_ENUMERATION("UserImage.ChangeChoice",
-                              image_index,
+                              GetDefaultImageHistogramValue(image_index),
                               kHistogramImagesCount);
     VLOG(1) << "Selected default user image: " << image_index;
   } else if (image_url == user_photo_data_url_) {
     // Camera image is selected.
     if (user_photo_.empty()) {
       DCHECK(image_decoder_.get());
       waiting_for_camera_photo = true;
       VLOG(1) << "Still waiting for camera image to decode";
     } else {
       OnPhotoAccepted(user_photo_);
@@ skipping 93 matching lines @@
   OnPhotoAccepted(user_photo_);
 }
 
 void ChangePictureOptionsHandler::OnDecodeImageFailed(
     const ImageDecoder* decoder) {
   NOTREACHED() << "Failed to decode PNG image from WebUI";
 }
 
 }  // namespace options2
 }  // namespace chromeos