Chromium Code Reviews| Index: ash/root_window_controller_unittest.cc |
| diff --git a/ash/root_window_controller_unittest.cc b/ash/root_window_controller_unittest.cc |
| index 0753600a1257a6d57a24758152354106a2265806..3818e3057a7cb7c1eeb5457c30703f1f96c525df 100644 |
| --- a/ash/root_window_controller_unittest.cc |
| +++ b/ash/root_window_controller_unittest.cc |
| @@ -562,11 +562,32 @@ class VirtualKeyboardRootWindowControllerTest : public test::AshTestBase { |
| DISALLOW_COPY_AND_ASSIGN(VirtualKeyboardRootWindowControllerTest); |
| }; |
|
varkha
2013/10/04 01:54:07
Comment what this test does.
bshe
2013/10/04 03:04:39
Done.
|
| +TEST_F(VirtualKeyboardRootWindowControllerTest, |
| + VirtualKeyboardOnPrimaryRootWindowOnly) { |
| + if (!SupportsMultipleDisplays()) |
| + return; |
| + |
| + UpdateDisplay("500x500,500x500"); |
| + |
| + Shell::RootWindowList root_windows = Shell::GetAllRootWindows(); |
| + aura::RootWindow* primary_root_window = Shell::GetPrimaryRootWindow(); |
| + aura::RootWindow* secondary_root_window = |
| + root_windows[0] == primary_root_window ? |
| + root_windows[1] : root_windows[0]; |
| + |
| + aura::Window* keyboard_container = Shell::GetContainer(primary_root_window, |
| + internal::kShellWindowId_VirtualKeyboardContainer); |
| + ASSERT_TRUE(keyboard_container); |
|
varkha
2013/10/04 01:54:07
nit: consider inlining ASSERT_TRUE(Shell::GetConta
bshe
2013/10/04 03:04:39
Done.
|
| + keyboard_container = Shell::GetContainer(secondary_root_window, |
| + internal::kShellWindowId_VirtualKeyboardContainer); |
| + ASSERT_FALSE(keyboard_container); |
| +} |
| + |
| // Test for http://crbug.com/263599. Virtual keyboard should be able to receive |
| // events at blocked user session. |
| TEST_F(VirtualKeyboardRootWindowControllerTest, |
| ClickVirtualKeyboardInBlockedWindow) { |
| - aura::RootWindow* root_window = ash::Shell::GetPrimaryRootWindow(); |
| + aura::RootWindow* root_window = Shell::GetPrimaryRootWindow(); |
| aura::Window* keyboard_container = Shell::GetContainer(root_window, |
| internal::kShellWindowId_VirtualKeyboardContainer); |
| ASSERT_TRUE(keyboard_container); |