commit c4e418facea4f437f1a497f08c5adce76105725b
author ivankr@chromium.org <ivankr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> Mon Oct 15 15:53:45 2012
committer ivankr@chromium.org <ivankr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> Mon Oct 15 15:53:45 2012
tree 1f8e0c54dee8c46876286d328566cc06611beb53
parent 3acc325be40dff489fa048673a9da41fbf3d425c

[cros] Migrate user avatars from PNG to JPG format.

Also:
*) Decoupled image handling code from UserManager to UserImageManager (lots of refactoring).
*) Force Local State store on user login (and session start, for new users).


BUG=145613,154048,154370,154365,154366

Review URL: https://chromiumcodereview.appspot.com/11027064

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@161860 0039d316-1c4b-4281-b951-d872f2087c98

chrome/browser/prefs/browser_prefs.cc

diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browser_prefs.cc
index 5b4153b..e1121b453 100644
--- a/chrome/browser/prefs/browser_prefs.cc
+++ b/chrome/browser/prefs/browser_prefs.cc
@@ -97,6 +97,7 @@
 #include "chrome/browser/chromeos/audio/audio_handler.h"
 #include "chrome/browser/chromeos/customization_document.h"
 #include "chrome/browser/chromeos/display/display_preferences.h"
+#include "chrome/browser/chromeos/login/user_image_manager.h"
 #include "chrome/browser/chromeos/login/user_manager.h"
 #include "chrome/browser/chromeos/login/wallpaper_manager.h"
 #include "chrome/browser/chromeos/login/wizard_controller.h"
@@ -198,6 +199,7 @@
   chromeos::ProxyConfigServiceImpl::RegisterPrefs(local_state);
   chromeos::RegisterDisplayLocalStatePrefs(local_state);
   chromeos::ServicesCustomizationDocument::RegisterPrefs(local_state);
+  chromeos::UserImageManager::RegisterPrefs(local_state);
   chromeos::UserManager::RegisterPrefs(local_state);
   chromeos::WallpaperManager::RegisterPrefs(local_state);
   chromeos::WizardController::RegisterPrefs(local_state);