| 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 <stddef.h> | 7 #include <stddef.h> |
| 8 | 8 |
| 9 #include "ash/common/wallpaper/wallpaper_controller.h" | 9 #include "ash/common/wallpaper/wallpaper_controller.h" |
| 10 #include "ash/common/wm_shell.h" | 10 #include "ash/common/wm_shell.h" |
| (...skipping 774 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 785 chromeos::login::GuestAccountId(), chromeos::login::kGuestUserName, | 785 chromeos::login::GuestAccountId(), chromeos::login::kGuestUserName, |
| 786 false); | 786 false); |
| 787 UpdateDisplay("1600x1200"); | 787 UpdateDisplay("1600x1200"); |
| 788 WallpaperManager::Get()->SetDefaultWallpaperNow(EmptyAccountId()); | 788 WallpaperManager::Get()->SetDefaultWallpaperNow(EmptyAccountId()); |
| 789 wallpaper_manager_test_utils::WaitAsyncWallpaperLoadFinished(); | 789 wallpaper_manager_test_utils::WaitAsyncWallpaperLoadFinished(); |
| 790 EXPECT_TRUE(wallpaper_manager_test_utils::ImageIsNearColor( | 790 EXPECT_TRUE(wallpaper_manager_test_utils::ImageIsNearColor( |
| 791 controller_->GetWallpaper(), | 791 controller_->GetWallpaper(), |
| 792 wallpaper_manager_test_utils::kLargeGuestWallpaperColor)); | 792 wallpaper_manager_test_utils::kLargeGuestWallpaperColor)); |
| 793 } | 793 } |
| 794 | 794 |
| 795 // Fails (crbug/657180) | 795 IN_PROC_BROWSER_TEST_F(WallpaperManagerBrowserTest, SmallChildWallpaper) { |
| 796 IN_PROC_BROWSER_TEST_F(WallpaperManagerBrowserTest, | |
| 797 DISABLED_SmallChildWallpaper) { | |
| 798 if (!ash::test::AshTestHelper::SupportsMultipleDisplays()) | 796 if (!ash::test::AshTestHelper::SupportsMultipleDisplays()) |
| 799 return; | 797 return; |
| 800 CreateCmdlineWallpapers(); | 798 CreateCmdlineWallpapers(); |
| 801 LogInAsChild(test_account_id1_, kTestUser1Hash); | 799 LogInAsChild(test_account_id1_, kTestUser1Hash); |
| 802 UpdateDisplay("800x600"); | 800 UpdateDisplay("800x600"); |
| 803 WallpaperManager::Get()->SetDefaultWallpaperNow(EmptyAccountId()); | 801 WallpaperManager::Get()->SetDefaultWallpaperNow(EmptyAccountId()); |
| 804 wallpaper_manager_test_utils::WaitAsyncWallpaperLoadFinished(); | 802 wallpaper_manager_test_utils::WaitAsyncWallpaperLoadFinished(); |
| 805 EXPECT_TRUE(wallpaper_manager_test_utils::ImageIsNearColor( | 803 EXPECT_TRUE(wallpaper_manager_test_utils::ImageIsNearColor( |
| 806 controller_->GetWallpaper(), | 804 controller_->GetWallpaper(), |
| 807 wallpaper_manager_test_utils::kSmallChildWallpaperColor)); | 805 wallpaper_manager_test_utils::kSmallChildWallpaperColor)); |
| 808 } | 806 } |
| 809 | 807 |
| 810 // Fails (crbug/657180) | 808 IN_PROC_BROWSER_TEST_F(WallpaperManagerBrowserTest, LargeChildWallpaper) { |
| 811 IN_PROC_BROWSER_TEST_F(WallpaperManagerBrowserTest, | |
| 812 DISABLED_LargeChildWallpaper) { | |
| 813 if (!ash::test::AshTestHelper::SupportsMultipleDisplays()) | 809 if (!ash::test::AshTestHelper::SupportsMultipleDisplays()) |
| 814 return; | 810 return; |
| 815 | 811 |
| 816 CreateCmdlineWallpapers(); | 812 CreateCmdlineWallpapers(); |
| 817 LogInAsChild(test_account_id1_, kTestUser1Hash); | 813 LogInAsChild(test_account_id1_, kTestUser1Hash); |
| 818 UpdateDisplay("1600x1200"); | 814 UpdateDisplay("1600x1200"); |
| 819 WallpaperManager::Get()->SetDefaultWallpaperNow(EmptyAccountId()); | 815 WallpaperManager::Get()->SetDefaultWallpaperNow(EmptyAccountId()); |
| 820 wallpaper_manager_test_utils::WaitAsyncWallpaperLoadFinished(); | 816 wallpaper_manager_test_utils::WaitAsyncWallpaperLoadFinished(); |
| 821 EXPECT_TRUE(wallpaper_manager_test_utils::ImageIsNearColor( | 817 EXPECT_TRUE(wallpaper_manager_test_utils::ImageIsNearColor( |
| 822 controller_->GetWallpaper(), | 818 controller_->GetWallpaper(), |
| (...skipping 26 matching lines...) Expand all Loading... |
| 849 | 845 |
| 850 WallpaperManager::Get()->SetDefaultWallpaperNow(EmptyAccountId()); | 846 WallpaperManager::Get()->SetDefaultWallpaperNow(EmptyAccountId()); |
| 851 wallpaper_manager_test_utils::WaitAsyncWallpaperLoadFinished(); | 847 wallpaper_manager_test_utils::WaitAsyncWallpaperLoadFinished(); |
| 852 | 848 |
| 853 EXPECT_TRUE(wallpaper_manager_test_utils::ImageIsNearColor( | 849 EXPECT_TRUE(wallpaper_manager_test_utils::ImageIsNearColor( |
| 854 controller_->GetWallpaper(), | 850 controller_->GetWallpaper(), |
| 855 wallpaper_manager_test_utils::kSmallDefaultWallpaperColor)); | 851 wallpaper_manager_test_utils::kSmallDefaultWallpaperColor)); |
| 856 } | 852 } |
| 857 | 853 |
| 858 } // namespace chromeos | 854 } // namespace chromeos |
| OLD | NEW |