diff options
Diffstat (limited to 'chrome/browser/prefs/browser_prefs.cc')
| -rw-r--r-- | chrome/browser/prefs/browser_prefs.cc | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browser_prefs.cc index de0f753..24d5bfcbb 100644 --- a/chrome/browser/prefs/browser_prefs.cc +++ b/chrome/browser/prefs/browser_prefs.cc @@ -169,6 +169,7 @@ #include "chrome/browser/chromeos/login/users/avatar/user_image_sync_observer.h" #include "chrome/browser/chromeos/login/users/chrome_user_manager_impl.h" #include "chrome/browser/chromeos/login/users/multi_profile_user_controller.h" +#include "chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager.h" #include "chrome/browser/chromeos/net/proxy_config_handler.h" #include "chrome/browser/chromeos/policy/auto_enrollment_client.h" #include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h" @@ -214,10 +215,6 @@ #include "chrome/browser/ui/ash/chrome_launcher_prefs.h" #endif -#if !defined(USE_ATHENA) -#include "chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager.h" -#endif - namespace { enum MigratedPreferences { @@ -345,9 +342,7 @@ void RegisterLocalState(PrefRegistrySimple* registry) { chromeos::system::AutomaticRebootManager::RegisterPrefs(registry); chromeos::UserImageManager::RegisterPrefs(registry); chromeos::UserSessionManager::RegisterPrefs(registry); -#if !defined(USE_ATHENA) chromeos::WallpaperManager::RegisterPrefs(registry); -#endif chromeos::echo_offer::RegisterPrefs(registry); extensions::ExtensionAssetsManagerChromeOS::RegisterPrefs(registry); invalidation::InvalidatorStorage::RegisterPrefs(registry); |