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

Unified Diff: ash/wm/window_cycle_controller_unittest.cc

Issue 9788001: Remove stops_event_propagation from Window, since it's broken. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 9 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 side-by-side diff with in-line comments
Download patch
Index: ash/wm/window_cycle_controller_unittest.cc
===================================================================
--- ash/wm/window_cycle_controller_unittest.cc (revision 127786)
+++ ash/wm/window_cycle_controller_unittest.cc (working copy)
@@ -132,21 +132,15 @@
EXPECT_FALSE(controller->IsCycling());
EXPECT_TRUE(wm::IsActiveWindow(window0.get()));
- // 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();
+ // When the screen is locked, cycling window does not take effect.
+ Shell::GetInstance()->delegate()->LockScreen();
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()));
- // Hiding the lock screen is equivalent to not being locked.
- lock_screen_window->Hide();
+ Shell::GetInstance()->delegate()->UnlockScreen();
EXPECT_TRUE(wm::IsActiveWindow(window0.get()));
controller->HandleCycleWindow(WindowCycleController::FORWARD, false);
EXPECT_TRUE(wm::IsActiveWindow(window1.get()));

Powered by Google App Engine
This is Rietveld 408576698