summaryrefslogtreecommitdiffstats
path: root/ash/shell_unittest.cc
diff options
context:
space:
mode:
authormukai@chromium.org <mukai@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-10-29 18:56:42 +0000
committermukai@chromium.org <mukai@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-10-29 18:56:42 +0000
commit090c4f1e220d050fdd991e89baa90410caeacf30 (patch)
treeb4c9293ee9dd3b3717e74840e4b34d6dc6e61239 /ash/shell_unittest.cc
parentc6216810cd9a264c884c6d9ae0b80d9ee991c426 (diff)
downloadchromium_src-090c4f1e220d050fdd991e89baa90410caeacf30.zip
chromium_src-090c4f1e220d050fdd991e89baa90410caeacf30.tar.gz
chromium_src-090c4f1e220d050fdd991e89baa90410caeacf30.tar.bz2
Shows the proper system modal background for the window.
When a system modal dialog appears in the normal desktop during lock, it should create the background for SystemModalContainer, not for LockSystemModalContainer. BUG=156941 TEST=ash_unittests passed with the new test case. Review URL: https://chromiumcodereview.appspot.com/11234044 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@164695 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/shell_unittest.cc')
-rw-r--r--ash/shell_unittest.cc1
1 files changed, 1 insertions, 0 deletions
diff --git a/ash/shell_unittest.cc b/ash/shell_unittest.cc
index d9f1eb5..1d0811b 100644
--- a/ash/shell_unittest.cc
+++ b/ash/shell_unittest.cc
@@ -216,6 +216,7 @@ TEST_F(ShellTest, CreateLockScreenModalWindow) {
EXPECT_TRUE(GetDefaultContainer()->Contains(
widget->GetNativeWindow()->parent()));
+ Shell::GetInstance()->delegate()->LockScreen();
// Create a LockScreen window.
views::Widget* lock_widget = CreateTestWindow(widget_params);
ash::Shell::GetContainer(