| OLD | NEW |
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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/wm/lock_state_controller.h" | 5 #include "ash/wm/lock_state_controller.h" |
| 6 | 6 |
| 7 #include "ash/ash_switches.h" | 7 #include "ash/ash_switches.h" |
| 8 #include "ash/session_state_delegate.h" | 8 #include "ash/session_state_delegate.h" |
| 9 #include "ash/shell.h" | 9 #include "ash/shell.h" |
| 10 #include "ash/shell_window_ids.h" | 10 #include "ash/shell_window_ids.h" |
| (...skipping 28 matching lines...) Expand all Loading... |
| 39 bool cursor_visible() { | 39 bool cursor_visible() { |
| 40 return ash::Shell::GetInstance()->cursor_manager()->IsCursorVisible(); | 40 return ash::Shell::GetInstance()->cursor_manager()->IsCursorVisible(); |
| 41 } | 41 } |
| 42 | 42 |
| 43 void CheckCalledCallback(bool* flag) { | 43 void CheckCalledCallback(bool* flag) { |
| 44 if (flag) | 44 if (flag) |
| 45 (*flag) = true; | 45 (*flag) = true; |
| 46 } | 46 } |
| 47 | 47 |
| 48 aura::Window* GetContainer(int container ) { | 48 aura::Window* GetContainer(int container ) { |
| 49 aura::RootWindow* root_window = Shell::GetPrimaryRootWindow(); | 49 aura::Window* root_window = Shell::GetPrimaryRootWindow(); |
| 50 return Shell::GetContainer(root_window, container); | 50 return Shell::GetContainer(root_window, container); |
| 51 } | 51 } |
| 52 | 52 |
| 53 bool IsBackgroundHidden() { | 53 bool IsBackgroundHidden() { |
| 54 return !GetContainer(internal::kShellWindowId_DesktopBackgroundContainer)-> | 54 return !GetContainer(internal::kShellWindowId_DesktopBackgroundContainer)-> |
| 55 IsVisible(); | 55 IsVisible(); |
| 56 } | 56 } |
| 57 | 57 |
| 58 void ShowBackground() { | 58 void ShowBackground() { |
| 59 ui::ScopedLayerAnimationSettings settings( | 59 ui::ScopedLayerAnimationSettings settings( |
| (...skipping 995 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1055 | 1055 |
| 1056 Advance(SessionStateAnimator::ANIMATION_SPEED_MOVE_WINDOWS); | 1056 Advance(SessionStateAnimator::ANIMATION_SPEED_MOVE_WINDOWS); |
| 1057 ExpectUnlockAfterUIDestroyedAnimationFinished(); | 1057 ExpectUnlockAfterUIDestroyedAnimationFinished(); |
| 1058 EXPECT_TRUE(IsBackgroundHidden()); | 1058 EXPECT_TRUE(IsBackgroundHidden()); |
| 1059 | 1059 |
| 1060 ExpectUnlockedState(); | 1060 ExpectUnlockedState(); |
| 1061 } | 1061 } |
| 1062 | 1062 |
| 1063 } // namespace test | 1063 } // namespace test |
| 1064 } // namespace ash | 1064 } // namespace ash |
| OLD | NEW |