| Index: chrome/browser/chromeos/login/wallpaper_manager.cc
|
| diff --git a/chrome/browser/chromeos/login/wallpaper_manager.cc b/chrome/browser/chromeos/login/wallpaper_manager.cc
|
| index 948baae6be7eef4ce2fb66ad2148244e2c393d14..7b2c8584c3dc50c3304b048d3753228e76a993ac 100644
|
| --- a/chrome/browser/chromeos/login/wallpaper_manager.cc
|
| +++ b/chrome/browser/chromeos/login/wallpaper_manager.cc
|
| @@ -827,26 +827,6 @@ WallpaperManager::GetAppropriateResolution() {
|
| : WALLPAPER_RESOLUTION_SMALL;
|
| }
|
|
|
| -WallpaperManager::WallpaperResolution
|
| -WallpaperManager::GetAppropriateResolutionForTesting() {
|
| - gfx::Size size =
|
| - ash::DesktopBackgroundController::GetMaxDisplaySizeInNative();
|
| - const WallpaperResolution result = (size.width() > kSmallWallpaperMaxWidth ||
|
| - size.height() > kSmallWallpaperMaxHeight)
|
| - ? WALLPAPER_RESOLUTION_LARGE
|
| - : WALLPAPER_RESOLUTION_SMALL;
|
| -
|
| - LOG(ERROR) << "WallpaperManager::GetAppropriateResolution(): width()="
|
| - << size.width()
|
| - << " vs kSmallWallpaperMaxWidth=" << kSmallWallpaperMaxWidth
|
| - << ", height()=" << size.height()
|
| - << " vs kSmallWallpaperMaxHeight=" << kSmallWallpaperMaxHeight
|
| - << ", result = " << (result == WALLPAPER_RESOLUTION_LARGE
|
| - ? "WALLPAPER_RESOLUTION_LARGE"
|
| - : "WALLPAPER_RESOLUTION_SMALL");
|
| - return result;
|
| -}
|
| -
|
| void WallpaperManager::SetPolicyControlledWallpaper(
|
| const std::string& user_id,
|
| const UserImage& user_image) {
|
|
|