| Index: ash/desktop_background/desktop_background_controller.cc
|
| diff --git a/ash/desktop_background/desktop_background_controller.cc b/ash/desktop_background/desktop_background_controller.cc
|
| index 83b486c4808ea4692a786d0f352ccc178be46ea8..0bd8b3542efdffc1fbf6f4ec800ef6d77c570ab8 100644
|
| --- a/ash/desktop_background/desktop_background_controller.cc
|
| +++ b/ash/desktop_background/desktop_background_controller.cc
|
| @@ -26,8 +26,6 @@
|
| namespace ash {
|
| namespace {
|
|
|
| -const int kSmallWallpaperMaximalWidth = 1366;
|
| -const int kSmallWallpaperMaximalHeight = 800;
|
| const SkColor kTransparentColor = SkColorSetARGB(0x00, 0x00, 0x00, 0x00);
|
|
|
| internal::RootWindowLayoutManager* GetRootWindowLayoutManager(
|
| @@ -37,6 +35,11 @@ internal::RootWindowLayoutManager* GetRootWindowLayoutManager(
|
| }
|
| } // namespace
|
|
|
| +const int kSmallWallpaperMaxWidth = 1366;
|
| +const int kSmallWallpaperMaxHeight = 800;
|
| +const int kLargeWallpaperMaxWidth = 2560;
|
| +const int kLargeWallpaperMaxHeight = 1700;
|
| +
|
| // Stores the current wallpaper data.
|
| struct DesktopBackgroundController::WallpaperData {
|
| WallpaperData(int index, WallpaperResolution resolution)
|
| @@ -228,8 +231,8 @@ WallpaperResolution DesktopBackgroundController::GetAppropriateResolution() {
|
| for (Shell::RootWindowList::iterator iter = root_windows.begin();
|
| iter != root_windows.end(); ++iter) {
|
| gfx::Size root_window_size = (*iter)->GetHostSize();
|
| - if (root_window_size.width() > kSmallWallpaperMaximalWidth ||
|
| - root_window_size.height() > kSmallWallpaperMaximalHeight)
|
| + if (root_window_size.width() > kSmallWallpaperMaxWidth ||
|
| + root_window_size.height() > kSmallWallpaperMaxHeight)
|
| resolution = LARGE;
|
| }
|
| return resolution;
|
|
|