| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 "ash/desktop_background/desktop_background_controller.h" | 5 #include "ash/desktop_background/desktop_background_controller.h" |
| 6 | 6 |
| 7 #include <cmath> | 7 #include <cmath> |
| 8 #include <cstdlib> | 8 #include <cstdlib> |
| 9 | 9 |
| 10 #include "ash/ash_switches.h" | 10 #include "ash/ash_switches.h" |
| (...skipping 161 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 172 RunDesktopControllerAnimation(); | 172 RunDesktopControllerAnimation(); |
| 173 | 173 |
| 174 // Ownership has moved from kAnimatingDesktopController to kDesktopController. | 174 // Ownership has moved from kAnimatingDesktopController to kDesktopController. |
| 175 EXPECT_FALSE(root_window_controller->animating_wallpaper_controller()-> | 175 EXPECT_FALSE(root_window_controller->animating_wallpaper_controller()-> |
| 176 GetController(false)); | 176 GetController(false)); |
| 177 EXPECT_TRUE(root_window_controller->wallpaper_controller()); | 177 EXPECT_TRUE(root_window_controller->wallpaper_controller()); |
| 178 } | 178 } |
| 179 | 179 |
| 180 // Test for crbug.com/149043 "Unlock screen, no launcher appears". Ensure we | 180 // Test for crbug.com/149043 "Unlock screen, no launcher appears". Ensure we |
| 181 // move all desktop views if there are more than one. | 181 // move all desktop views if there are more than one. |
| 182 TEST_F(DesktopBackgroundControllerTest, BackgroundMovementDuringUnlock) { | 182 // Disabled for crbug.com/366993 |
| 183 TEST_F(DesktopBackgroundControllerTest, DISABLED_BackgroundMovementDuringUnlock)
{ |
| 183 // We cannot short-circuit animations for this test. | 184 // We cannot short-circuit animations for this test. |
| 184 ui::ScopedAnimationDurationScaleMode normal_duration_mode( | 185 ui::ScopedAnimationDurationScaleMode normal_duration_mode( |
| 185 ui::ScopedAnimationDurationScaleMode::NORMAL_DURATION); | 186 ui::ScopedAnimationDurationScaleMode::NORMAL_DURATION); |
| 186 | 187 |
| 187 // Reset wallpaper state, see ControllerOwnership above. | 188 // Reset wallpaper state, see ControllerOwnership above. |
| 188 DesktopBackgroundController* controller = | 189 DesktopBackgroundController* controller = |
| 189 Shell::GetInstance()->desktop_background_controller(); | 190 Shell::GetInstance()->desktop_background_controller(); |
| 190 controller->CreateEmptyWallpaper(); | 191 controller->CreateEmptyWallpaper(); |
| 191 | 192 |
| 192 // Run wallpaper show animation to completion. | 193 // Run wallpaper show animation to completion. |
| (...skipping 148 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 341 | 342 |
| 342 // Maximum width and height belongs to different displays. | 343 // Maximum width and height belongs to different displays. |
| 343 UpdateDisplay("400x300,100x500"); | 344 UpdateDisplay("400x300,100x500"); |
| 344 EXPECT_EQ( | 345 EXPECT_EQ( |
| 345 "400x500", | 346 "400x500", |
| 346 DesktopBackgroundController::GetMaxDisplaySizeInNative().ToString()); | 347 DesktopBackgroundController::GetMaxDisplaySizeInNative().ToString()); |
| 347 } | 348 } |
| 348 | 349 |
| 349 | 350 |
| 350 } // namespace ash | 351 } // namespace ash |
| OLD | NEW |