[cros, user_manager] Move default user images constants and helper functions out of src/chrome.

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

 // Copyright (c) 2013 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/options/chromeos/change_picture_options_handler.h"
 
 #include "ash/audio/sounds.h"
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/command_line.h"
 #include "base/metrics/histogram.h"
 #include "base/path_service.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/values.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/chromeos/camera_presence_notifier.h"
-#include "chrome/browser/chromeos/login/users/avatar/default_user_images.h"
 #include "chrome/browser/chromeos/login/users/avatar/user_image_manager.h"
 #include "chrome/browser/chromeos/login/users/user_manager.h"
 #include "chrome/browser/chromeos/profiles/profile_helper.h"
 #include "chrome/browser/ui/browser_finder.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/chrome_select_file_policy.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/url_constants.h"
 #include "chromeos/audio/chromeos_sounds.h"
+#include "components/user_manager/user_image/default_user_images.h"
 #include "components/user_manager/user_image/user_image.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/web_ui.h"
 #include "content/public/common/url_constants.h"
 #include "grit/browser_resources.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
 #include "net/base/data_url.h"
 #include "ui/base/l10n/l10n_util.h"
@@ skipping 120 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() {
   base::ListValue image_urls;
-  for (int i = kFirstDefaultImageIndex; i < kDefaultImagesCount; ++i) {
+  for (int i = user_manager::kFirstDefaultImageIndex;
+       i < user_manager::kDefaultImagesCount;
+       ++i) {
     scoped_ptr<base::DictionaryValue> image_data(new base::DictionaryValue);
-    image_data->SetString("url", GetDefaultImageUrl(i));
+    image_data->SetString("url", user_manager::GetDefaultImageUrl(i));
     image_data->SetString(
-        "author", l10n_util::GetStringUTF16(kDefaultImageAuthorIDs[i]));
+        "author",
+        l10n_util::GetStringUTF16(user_manager::kDefaultImageAuthorIDs[i]));
     image_data->SetString(
-        "website", l10n_util::GetStringUTF16(kDefaultImageWebsiteIDs[i]));
-    image_data->SetString("title", GetDefaultImageDescription(i));
+        "website",
+        l10n_util::GetStringUTF16(user_manager::kDefaultImageWebsiteIDs[i]));
+    image_data->SetString("title", user_manager::GetDefaultImageDescription(i));
     image_urls.Append(image_data.release());
   }
   web_ui()->CallJavascriptFunction("ChangePictureOptions.setDefaultImages",
                                    image_urls);
 }
 
 void ChangePictureOptionsHandler::HandleChooseFile(
     const base::ListValue* args) {
   DCHECK(args && args->empty());
   select_file_dialog_ = ui::SelectFileDialog::Create(
@@ skipping 87 matching lines @@
       SendOldImage(webui::GetBitmapDataUrl(*previous_image_.bitmap()));
       break;
     }
     case User::kProfileImageIndex: {
       // User has his/her Profile image as the current image.
       SendProfileImage(user->GetImage(), true);
       break;
     }
     default: {
       DCHECK(previous_image_index_ >= 0 &&
-             previous_image_index_ < kDefaultImagesCount);
-      if (previous_image_index_ >= kFirstDefaultImageIndex) {
+             previous_image_index_ < user_manager::kDefaultImagesCount);
+      if (previous_image_index_ >= user_manager::kFirstDefaultImageIndex) {
         // User has image from the current set of default images.
-        base::StringValue image_url(GetDefaultImageUrl(previous_image_index_));
+        base::StringValue image_url(
+            user_manager::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.
-        SendOldImage(GetDefaultImageUrl(previous_image_index_));
+        SendOldImage(user_manager::GetDefaultImageUrl(previous_image_index_));
       }
     }
   }
 }
 
 void ChangePictureOptionsHandler::SendProfileImage(const gfx::ImageSkia& image,
                                                    bool should_select) {
   base::StringValue data_url(webui::GetBitmapDataUrl(*image.bitmap()));
   base::FundamentalValue select(should_select);
   web_ui()->CallJavascriptFunction("ChangePictureOptions.setProfileImage",
@@ skipping 37 matching lines @@
   int image_index = User::kInvalidImageIndex;
   bool waiting_for_camera_photo = false;
 
   if (image_type == "old") {
     // Previous image (from camera or manually uploaded) re-selected.
     DCHECK(!previous_image_.isNull());
     user_image_manager->SaveUserImage(
         user_manager::UserImage::CreateAndEncode(previous_image_));
 
     UMA_HISTOGRAM_ENUMERATION("UserImage.ChangeChoice",
-                              kHistogramImageOld,
-                              kHistogramImagesCount);
+                              user_manager::kHistogramImageOld,
+                              user_manager::kHistogramImagesCount);
     VLOG(1) << "Selected old user image";
   } else if (image_type == "default" &&
-             IsDefaultImageUrl(image_url, &image_index)) {
+             user_manager::IsDefaultImageUrl(image_url, &image_index)) {
     // One of the default user images.
     user_image_manager->SaveUserDefaultImageIndex(image_index);
 
-    UMA_HISTOGRAM_ENUMERATION("UserImage.ChangeChoice",
-                              GetDefaultImageHistogramValue(image_index),
-                              kHistogramImagesCount);
+    UMA_HISTOGRAM_ENUMERATION(
+        "UserImage.ChangeChoice",
+        user_manager::GetDefaultImageHistogramValue(image_index),
+        user_manager::kHistogramImagesCount);
     VLOG(1) << "Selected default user image: " << image_index;
   } else if (image_type == "camera") {
     // Camera image is selected.
     if (user_photo_.isNull()) {
       DCHECK(image_decoder_.get());
       waiting_for_camera_photo = true;
       VLOG(1) << "Still waiting for camera image to decode";
     } else {
       SetImageFromCamera(user_photo_);
     }
   } else if (image_type == "profile") {
     // Profile image selected. Could be previous (old) user image.
     user_image_manager->SaveUserImageFromProfileImage();
 
     if (previous_image_index_ == User::kProfileImageIndex) {
       UMA_HISTOGRAM_ENUMERATION("UserImage.ChangeChoice",
-                                kHistogramImageOld,
-                                kHistogramImagesCount);
+                                user_manager::kHistogramImageOld,
+                                user_manager::kHistogramImagesCount);
       VLOG(1) << "Selected old (profile) user image";
     } else {
       UMA_HISTOGRAM_ENUMERATION("UserImage.ChangeChoice",
-                                kHistogramImageFromProfile,
-                                kHistogramImagesCount);
+                                user_manager::kHistogramImageFromProfile,
+                                user_manager::kHistogramImagesCount);
       VLOG(1) << "Selected profile image";
     }
   } else {
     NOTREACHED() << "Unexpected image type: " << image_type;
   }
 
   // Ignore the result of the previous decoding if it's no longer needed.
   if (!waiting_for_camera_photo && image_decoder_.get())
     image_decoder_->set_delegate(NULL);
 }
 
 void ChangePictureOptionsHandler::FileSelected(const base::FilePath& path,
                                                int index,
                                                void* params) {
   UserManager* user_manager = UserManager::Get();
   user_manager->GetUserImageManager(GetUser()->email())->
       SaveUserImageFromFile(path);
-  UMA_HISTOGRAM_ENUMERATION(
-      "UserImage.ChangeChoice", kHistogramImageFromFile, kHistogramImagesCount);
+  UMA_HISTOGRAM_ENUMERATION("UserImage.ChangeChoice",
+                            user_manager::kHistogramImageFromFile,
+                            user_manager::kHistogramImagesCount);
   VLOG(1) << "Selected image from file";
 }
 
 void ChangePictureOptionsHandler::SetImageFromCamera(
     const gfx::ImageSkia& photo) {
   UserManager* user_manager = UserManager::Get();
   user_manager->GetUserImageManager(GetUser()->email())
       ->SaveUserImage(user_manager::UserImage::CreateAndEncode(photo));
   UMA_HISTOGRAM_ENUMERATION("UserImage.ChangeChoice",
-                            kHistogramImageFromCamera,
-                            kHistogramImagesCount);
+                            user_manager::kHistogramImageFromCamera,
+                            user_manager::kHistogramImagesCount);
   VLOG(1) << "Selected camera photo";
 }
 
 void ChangePictureOptionsHandler::SetCameraPresent(bool present) {
   base::FundamentalValue present_value(present);
 
   web_ui()->CallJavascriptFunction("ChangePictureOptions.setCameraPresent",
                                    present_value);
 }
 
@@ skipping 41 matching lines @@
 User* ChangePictureOptionsHandler::GetUser() const {
   Profile* profile = Profile::FromWebUI(web_ui());
   User* user = ProfileHelper::Get()->GetUserByProfile(profile);
   if (!user)
     return UserManager::Get()->GetActiveUser();
   return user;
 }
 
 }  // namespace options
 }  // namespace chromeos