Move UserImage to user_manager

chrome/browser/chromeos/login/users/user.cc

 // Copyright 2014 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/chromeos/login/users/user.h"
 
 #include "base/logging.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/threading/thread_restrictions.h"
@@ skipping 190 matching lines @@
       is_active_(false),
       profile_is_created_(false) {
 }
 
 User::~User() {}
 
 void User::SetAccountLocale(const std::string& resolved_account_locale) {
   account_locale_.reset(new std::string(resolved_account_locale));
 }
 
-void User::SetImage(const UserImage& user_image, int image_index) {
+void User::SetImage(const user_manager::UserImage& user_image,
+                    int image_index) {
   user_image_ = user_image;
   image_index_ = image_index;
   image_is_stub_ = false;
   image_is_loading_ = false;
   DCHECK(HasDefaultImage() || user_image.has_raw_image());
 }
 
 void User::SetImageURL(const GURL& image_url) {
   user_image_.set_url(image_url);
 }
 
 void User::SetStubImage(int image_index, bool is_loading) {
-  user_image_ = UserImage(
-      *ResourceBundle::GetSharedInstance().
-          GetImageSkiaNamed(IDR_PROFILE_PICTURE_LOADING));
+  user_image_ = user_manager::UserImage(
+      *ResourceBundle::GetSharedInstance().GetImageSkiaNamed(
+          IDR_PROFILE_PICTURE_LOADING));
   image_index_ = image_index;
   image_is_stub_ = true;
   image_is_loading_ = is_loading;
 }
 
 RegularUser::RegularUser(const std::string& email) : User(email) {
   set_can_lock(true);
   set_display_email(email);
 }
 
@@ skipping 73 matching lines @@
     case user_manager::USER_TYPE_LOCALLY_MANAGED:
     case user_manager::USER_TYPE_KIOSK_APP:
       return false;
     default:
       NOTREACHED();
   }
   return false;
 }
 
 }  // namespace chromeos