| 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..a48f9dc1c5df47ca6d86c95d24470be9cf91022e 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 kSmallWallpaperMaximalWidth = 1366;
|
| +const int kSmallWallpaperMaximalHeight = 800;
|
| +const int kLargeWallpaperMaximalWidth = 2560;
|
| +const int kLargeWallpaperMaximalHeight = 1700;
|
| +
|
| // Stores the current wallpaper data.
|
| struct DesktopBackgroundController::WallpaperData {
|
| WallpaperData(int index, WallpaperResolution resolution)
|
|
|