Retry landing "Enable users change desktop background image from settings page in Chromeos Aura bui…

chrome/browser/chromeos/login/user_manager.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/chromeos/login/user_manager.h"
 
 #include "base/synchronization/lock.h"
 #include "chrome/browser/chromeos/login/user_manager_impl.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "content/public/browser/browser_thread.h"
 
 namespace chromeos {
 
 // static
 const char UserManager::kLoggedInUsers[] = "LoggedInUsers";
+const char UserManager::kUserWallpapers[] = "UserWallpapers";
 const char UserManager::kUserImages[] = "UserImages";
 const char UserManager::kUserDisplayEmail[] = "UserDisplayEmail";
 const char UserManager::kUserOAuthTokenStatus[] = "OAuthTokenStatus";
 
 // Class that is holds pointer to UserManager instance.
 // One could set UserManager mock instance through it (see UserManager::Set).
 class UserManagerImplWrapper {
  public:
   static UserManagerImplWrapper* GetInstance() {
     return Singleton<UserManagerImplWrapper>::get();
@@ skipping 36 matching lines @@
 }
 
 // static
 void UserManager::Set(UserManager* mock) {
   UserManagerImplWrapper::GetInstance()->reset(mock);
 }
 
 // static
 void UserManager::RegisterPrefs(PrefService* local_state) {
   local_state->RegisterListPref(kLoggedInUsers, PrefService::UNSYNCABLE_PREF);
+  local_state->RegisterDictionaryPref(kUserWallpapers,
+                                      PrefService::UNSYNCABLE_PREF);
   local_state->RegisterDictionaryPref(kUserImages,
                                       PrefService::UNSYNCABLE_PREF);
   local_state->RegisterDictionaryPref(kUserOAuthTokenStatus,
                                       PrefService::UNSYNCABLE_PREF);
   local_state->RegisterDictionaryPref(kUserDisplayEmail,
                                       PrefService::UNSYNCABLE_PREF);
 }
 
 UserManager::~UserManager() {
 }
 
 }  // namespace chromeos