| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager.h" | 5 #include "chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager.h" |
| 6 | 6 |
| 7 #include "ash/desktop_background/desktop_background_controller.h" | 7 #include "ash/desktop_background/desktop_background_controller.h" |
| 8 #include "ash/desktop_background/desktop_background_controller_observer.h" | 8 #include "ash/desktop_background/desktop_background_controller_observer.h" |
| 9 #include "ash/desktop_background/desktop_background_controller_test_api.h" | 9 #include "ash/desktop_background/desktop_background_controller_test_api.h" |
| 10 #include "ash/display/display_manager.h" | 10 #include "ash/display/display_manager.h" |
| (...skipping 16 matching lines...) Expand all Loading... |
| 27 #include "chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager_test_u
tils.h" | 27 #include "chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager_test_u
tils.h" |
| 28 #include "chrome/common/chrome_paths.h" | 28 #include "chrome/common/chrome_paths.h" |
| 29 #include "chrome/test/base/in_process_browser_test.h" | 29 #include "chrome/test/base/in_process_browser_test.h" |
| 30 #include "chrome/test/base/testing_browser_process.h" | 30 #include "chrome/test/base/testing_browser_process.h" |
| 31 #include "chromeos/chromeos_switches.h" | 31 #include "chromeos/chromeos_switches.h" |
| 32 #include "chromeos/login/user_names.h" | 32 #include "chromeos/login/user_names.h" |
| 33 #include "components/user_manager/user.h" | 33 #include "components/user_manager/user.h" |
| 34 #include "components/user_manager/user_manager.h" | 34 #include "components/user_manager/user_manager.h" |
| 35 #include "content/public/test/test_utils.h" | 35 #include "content/public/test/test_utils.h" |
| 36 #include "ui/aura/env.h" | 36 #include "ui/aura/env.h" |
| 37 #include "ui/gfx/geometry/point.h" |
| 37 #include "ui/gfx/image/image_skia.h" | 38 #include "ui/gfx/image/image_skia.h" |
| 38 #include "ui/gfx/point.h" | |
| 39 #include "ui/gfx/rect.h" | 39 #include "ui/gfx/rect.h" |
| 40 | 40 |
| 41 using wallpaper::WallpaperLayout; | 41 using wallpaper::WallpaperLayout; |
| 42 using wallpaper::WallpaperInfo; | 42 using wallpaper::WallpaperInfo; |
| 43 using wallpaper::WALLPAPER_LAYOUT_CENTER; | 43 using wallpaper::WALLPAPER_LAYOUT_CENTER; |
| 44 using wallpaper::WALLPAPER_LAYOUT_CENTER_CROPPED; | 44 using wallpaper::WALLPAPER_LAYOUT_CENTER_CROPPED; |
| 45 using wallpaper::WALLPAPER_LAYOUT_STRETCH; | 45 using wallpaper::WALLPAPER_LAYOUT_STRETCH; |
| 46 using wallpaper::WALLPAPER_LAYOUT_TILE; | 46 using wallpaper::WALLPAPER_LAYOUT_TILE; |
| 47 | 47 |
| 48 namespace chromeos { | 48 namespace chromeos { |
| (...skipping 740 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 789 | 789 |
| 790 WallpaperManager::Get()->SetDefaultWallpaperNow(std::string()); | 790 WallpaperManager::Get()->SetDefaultWallpaperNow(std::string()); |
| 791 wallpaper_manager_test_utils::WaitAsyncWallpaperLoadFinished(); | 791 wallpaper_manager_test_utils::WaitAsyncWallpaperLoadFinished(); |
| 792 | 792 |
| 793 EXPECT_TRUE(wallpaper_manager_test_utils::ImageIsNearColor( | 793 EXPECT_TRUE(wallpaper_manager_test_utils::ImageIsNearColor( |
| 794 controller_->GetWallpaper(), | 794 controller_->GetWallpaper(), |
| 795 wallpaper_manager_test_utils::kSmallDefaultWallpaperColor)); | 795 wallpaper_manager_test_utils::kSmallDefaultWallpaperColor)); |
| 796 } | 796 } |
| 797 | 797 |
| 798 } // namespace chromeos | 798 } // namespace chromeos |
| OLD | NEW |