Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(190)

Side by Side Diff: ash/wm/lock_state_controller_unittest.cc

Issue 1351363002: Fix the typo "visibility". (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | ash/wm/window_state.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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/session/session_state_delegate.h" 7 #include "ash/session/session_state_delegate.h"
8 #include "ash/shell.h" 8 #include "ash/shell.h"
9 #include "ash/test/ash_test_base.h" 9 #include "ash/test/ash_test_base.h"
10 #include "ash/test/test_lock_state_controller_delegate.h" 10 #include "ash/test/test_lock_state_controller_delegate.h"
(...skipping 942 matching lines...) Expand 10 before | Expand all | Expand 10 after
953 AdvancePartially(SessionStateAnimator::ANIMATION_SPEED_UNDOABLE, 0.5f); 953 AdvancePartially(SessionStateAnimator::ANIMATION_SPEED_UNDOABLE, 0.5f);
954 954
955 // Release the button before the lock timer fires. 955 // Release the button before the lock timer fires.
956 ReleasePowerButton(); 956 ReleasePowerButton();
957 ExpectPreLockAnimationCancel(); 957 ExpectPreLockAnimationCancel();
958 ExpectBackgroundIsHiding(); 958 ExpectBackgroundIsHiding();
959 959
960 Advance(SessionStateAnimator::ANIMATION_SPEED_UNDO_MOVE_WINDOWS); 960 Advance(SessionStateAnimator::ANIMATION_SPEED_UNDO_MOVE_WINDOWS);
961 961
962 // When the CancelPrelockAnimation sequence finishes it queues up a 962 // When the CancelPrelockAnimation sequence finishes it queues up a
963 // restore background visibilty sequence when the background is hidden. 963 // restore background visibility sequence when the background is hidden.
964 ExpectRestoringBackgroundVisibility(); 964 ExpectRestoringBackgroundVisibility();
965 965
966 Advance(SessionStateAnimator::ANIMATION_SPEED_IMMEDIATE); 966 Advance(SessionStateAnimator::ANIMATION_SPEED_IMMEDIATE);
967 967
968 ExpectUnlockedState(); 968 ExpectUnlockedState();
969 } 969 }
970 970
971 // Test that hidden background appears and revers correctly on lock/unlock. 971 // Test that hidden background appears and revers correctly on lock/unlock.
972 TEST_F(LockStateControllerTest, TestHiddenBackgroundLockUnlock) { 972 TEST_F(LockStateControllerTest, TestHiddenBackgroundLockUnlock) {
973 Initialize(false, user::LOGGED_IN_USER); 973 Initialize(false, user::LOGGED_IN_USER);
(...skipping 29 matching lines...) Expand all
1003 ExpectUnlockBeforeUIDestroyedAnimationFinished(); 1003 ExpectUnlockBeforeUIDestroyedAnimationFinished();
1004 1004
1005 SystemUnlocks(); 1005 SystemUnlocks();
1006 1006
1007 ExpectUnlockAfterUIDestroyedAnimationStarted(); 1007 ExpectUnlockAfterUIDestroyedAnimationStarted();
1008 ExpectBackgroundIsHiding(); 1008 ExpectBackgroundIsHiding();
1009 1009
1010 Advance(SessionStateAnimator::ANIMATION_SPEED_MOVE_WINDOWS); 1010 Advance(SessionStateAnimator::ANIMATION_SPEED_MOVE_WINDOWS);
1011 1011
1012 // When the StartUnlockAnimationAfterUIDestroyed sequence finishes it queues 1012 // When the StartUnlockAnimationAfterUIDestroyed sequence finishes it queues
1013 // up a restore background visibilty sequence when the background is hidden. 1013 // up a restore background visibility sequence when the background is hidden.
1014 ExpectRestoringBackgroundVisibility(); 1014 ExpectRestoringBackgroundVisibility();
1015 1015
1016 Advance(SessionStateAnimator::ANIMATION_SPEED_IMMEDIATE); 1016 Advance(SessionStateAnimator::ANIMATION_SPEED_IMMEDIATE);
1017 1017
1018 ExpectUnlockAfterUIDestroyedAnimationFinished(); 1018 ExpectUnlockAfterUIDestroyedAnimationFinished();
1019 1019
1020 ExpectUnlockedState(); 1020 ExpectUnlockedState();
1021 } 1021 }
1022 1022
1023 TEST_F(LockStateControllerTest, Screenshot) { 1023 TEST_F(LockStateControllerTest, Screenshot) {
(...skipping 76 matching lines...) Expand 10 before | Expand all | Expand 10 after
1100 ReleasePowerButton(); 1100 ReleasePowerButton();
1101 1101
1102 ExpectPreLockAnimationStarted(); 1102 ExpectPreLockAnimationStarted();
1103 1103
1104 test_animator_->CompleteAllAnimations(true); 1104 test_animator_->CompleteAllAnimations(true);
1105 EXPECT_EQ(1, lock_state_controller_delegate_->num_lock_requests()); 1105 EXPECT_EQ(1, lock_state_controller_delegate_->num_lock_requests());
1106 } 1106 }
1107 1107
1108 } // namespace test 1108 } // namespace test
1109 } // namespace ash 1109 } // namespace ash
OLDNEW
« no previous file with comments | « no previous file | ash/wm/window_state.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698