diff options
| author | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-23 16:52:41 +0000 |
|---|---|---|
| committer | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-23 16:52:41 +0000 |
| commit | b227ed707ed9a16bd071098a1500a182ea83a652 (patch) | |
| tree | 5e16c700fee1b57130e51226d619824fa3d7f83f /ash/wm/window_cycle_controller_unittest.cc | |
| parent | 7d733b43e51d53a70e5e8062e485b5cd533c25a8 (diff) | |
| download | chromium_src-b227ed707ed9a16bd071098a1500a182ea83a652.zip chromium_src-b227ed707ed9a16bd071098a1500a182ea83a652.tar.gz chromium_src-b227ed707ed9a16bd071098a1500a182ea83a652.tar.bz2 | |
Revert 128503 - Remove stops_event_propagation from Window, since it's broken.
Changes it to be implemented by the Aura client, via a new interface EventClient.
The client can determine whether or not a given window and its subtree can receive events.
I also cleaned up the way screen locking is entered/exited via the delegate, and some stuff in ash/shell.
http://crbug.com/119347
TEST=none
Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=128328
Review URL: https://chromiumcodereview.appspot.com/9788001
TBR=ben@chromium.org
Review URL: https://chromiumcodereview.appspot.com/9808068
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@128508 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/wm/window_cycle_controller_unittest.cc')
| -rw-r--r-- | ash/wm/window_cycle_controller_unittest.cc | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/ash/wm/window_cycle_controller_unittest.cc b/ash/wm/window_cycle_controller_unittest.cc index 3aaac40..499acdc 100644 --- a/ash/wm/window_cycle_controller_unittest.cc +++ b/ash/wm/window_cycle_controller_unittest.cc @@ -132,15 +132,21 @@ TEST_F(WindowCycleControllerTest, HandleCycleWindow) { EXPECT_FALSE(controller->IsCycling()); EXPECT_TRUE(wm::IsActiveWindow(window0.get())); - // When the screen is locked, cycling window does not take effect. - Shell::GetInstance()->delegate()->LockScreen(); + // When a screen lock window is visible, cycling window does not take effect. + aura::Window* lock_screen_container = + Shell::GetInstance()->GetContainer( + internal::kShellWindowId_LockScreenContainer); + scoped_ptr<Window> lock_screen_window( + CreateTestWindowWithId(-1, lock_screen_container)); + lock_screen_window->Show(); EXPECT_TRUE(wm::IsActiveWindow(window0.get())); controller->HandleCycleWindow(WindowCycleController::FORWARD, false); EXPECT_TRUE(wm::IsActiveWindow(window0.get())); controller->HandleCycleWindow(WindowCycleController::BACKWARD, false); EXPECT_TRUE(wm::IsActiveWindow(window0.get())); - Shell::GetInstance()->delegate()->UnlockScreen(); + // Hiding the lock screen is equivalent to not being locked. + lock_screen_window->Hide(); EXPECT_TRUE(wm::IsActiveWindow(window0.get())); controller->HandleCycleWindow(WindowCycleController::FORWARD, false); EXPECT_TRUE(wm::IsActiveWindow(window1.get())); |