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

Unified Diff: ash/shell_unittest.cc

Issue 9181012: Don't activate a window if screen is locked. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 8 years, 11 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/shell_unittest.cc
diff --git a/ash/shell_unittest.cc b/ash/shell_unittest.cc
index 6604799d6cf5b3dd2ea95208189aaef480d17253..17c185a20baf5aec836ab1c1fe0adc257caf1ad2 100644
--- a/ash/shell_unittest.cc
+++ b/ash/shell_unittest.cc
@@ -242,9 +242,8 @@ TEST_F(ShellTest, IsScreenLocked) {
// A lock screen window locks the screen.
views::Widget* lock_widget = CreateTestWindow(widget_params);
- ash::Shell::GetInstance()->GetContainer(
- ash::internal::kShellWindowId_LockScreenContainer)->
- AddChild(lock_widget->GetNativeView());
+ lock_widget->GetNativeView()->set_stops_event_propagation(true);
+ lock_widget->GetNativeView()->SetParent(NULL);
lock_widget->Show();
EXPECT_TRUE(Shell::GetInstance()->IsScreenLocked());
lock_widget->Hide();

Powered by Google App Engine
This is Rietveld 408576698