Revert 284417 "Move default user profile images strings and reso..."

trunk/src/chrome/browser/ui/webui/options/chromeos/user_image_source.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/options/chromeos/user_image_source.h"
 
 #include "base/memory/ref_counted_memory.h"
 #include "base/message_loop/message_loop.h"
 #include "base/strings/string_split.h"
+#include "chrome/browser/chromeos/login/users/avatar/default_user_images.h"
 #include "chrome/browser/chromeos/login/users/user_manager.h"
 #include "chrome/common/url_constants.h"
-#include "components/user_manager/user_image/default_user_images.h"
 #include "grit/theme_resources.h"
-#include "grit/ui_chromeos_resources.h"
 #include "net/base/escape.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/codec/png_codec.h"
 #include "url/url_parse.h"
 
 namespace {
 
 // Animated key is used in user image URL requests to specify that
 // animated version of user image is required. Without that key
 // non-animated version of user image should be returned.
@@ skipping 34 matching lines @@
   if (user) {
     if (user->has_animated_image() && is_image_animated) {
       return new base::RefCountedBytes(user->animated_image());
     } else if (user->has_raw_image()) {
       return new base::RefCountedBytes(user->raw_image());
     } else if (user->image_is_stub()) {
       return ResourceBundle::GetSharedInstance().
           LoadDataResourceBytesForScale(IDR_PROFILE_PICTURE_LOADING,
                                         scale_factor);
     } else if (user->HasDefaultImage()) {
-      return ResourceBundle::GetSharedInstance().LoadDataResourceBytesForScale(
-          user_manager::kDefaultImageResourceIDs[user->image_index()],
-          scale_factor);
+      return ResourceBundle::GetSharedInstance().
+          LoadDataResourceBytesForScale(
+              kDefaultImageResourceIDs[user->image_index()],
+              scale_factor);
     } else {
       NOTREACHED() << "User with custom image missing raw data";
     }
   }
   return ResourceBundle::GetSharedInstance().
       LoadDataResourceBytesForScale(IDR_LOGIN_DEFAULT_USER, scale_factor);
 }
 
 UserImageSource::UserImageSource() {
 }
@@ skipping 28 matching lines @@
   if (is_image_animated) {
     const chromeos::User* user = chromeos::UserManager::Get()->FindUser(email);
     if (user && user->has_animated_image())
       return "image/gif";
   }
   return "image/png";
 }
 
 }  // namespace options
 }  // namespace chromeos