diff options
| author | kevers <kevers@chromium.org> | 2014-09-17 06:50:12 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-09-17 13:50:26 +0000 |
| commit | 23f3987d5ecd4be30938bd9673148830482ac777 (patch) | |
| tree | f87a64cf6300bcf95711eaacbcd90d3324bee816 /ash/root_window_controller.cc | |
| parent | 830c88cca3c89dfabcbfc360ac7c035a020b8307 (diff) | |
| download | chromium_src-23f3987d5ecd4be30938bd9673148830482ac777.zip chromium_src-23f3987d5ecd4be30938bd9673148830482ac777.tar.gz chromium_src-23f3987d5ecd4be30938bd9673148830482ac777.tar.bz2 | |
Adjust the z-order of the virtual keyboard to ensure that it does not overlap context menus. Previously, the virtual keyboard was placed just below the cursor container. Adding a test case to ensure that the virtual keyboard overlaps normal windows but not menus.
BUG=377180
Review URL: https://codereview.chromium.org/565373002
Cr-Commit-Position: refs/heads/master@{#295268}
Diffstat (limited to 'ash/root_window_controller.cc')
| -rw-r--r-- | ash/root_window_controller.cc | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/ash/root_window_controller.cc b/ash/root_window_controller.cc index 6635af3..f228004 100644 --- a/ash/root_window_controller.cc +++ b/ash/root_window_controller.cc @@ -1016,6 +1016,14 @@ void RootWindowController::CreateContainersInRootWindow( SetUsesScreenCoordinates(settings_bubble_container); DescendantShouldStayInSameRootWindow(settings_bubble_container); + aura::Window* virtual_keyboard_parent_container = + CreateContainer(kShellWindowId_VirtualKeyboardParentContainer, + "VirtualKeyboardParentContainer", + lock_screen_related_containers); + wm::SetSnapsChildrenToPhysicalPixelBoundary( + virtual_keyboard_parent_container); + SetUsesScreenCoordinates(virtual_keyboard_parent_container); + aura::Window* menu_container = CreateContainer( kShellWindowId_MenuContainer, "MenuContainer", @@ -1039,14 +1047,6 @@ void RootWindowController::CreateContainersInRootWindow( wm::SetSnapsChildrenToPhysicalPixelBoundary(overlay_container); SetUsesScreenCoordinates(overlay_container); - aura::Window* virtual_keyboard_parent_container = CreateContainer( - kShellWindowId_VirtualKeyboardParentContainer, - "VirtualKeyboardParentContainer", - root_window); - wm::SetSnapsChildrenToPhysicalPixelBoundary( - virtual_keyboard_parent_container); - SetUsesScreenCoordinates(virtual_keyboard_parent_container); - #if defined(OS_CHROMEOS) aura::Window* mouse_cursor_container = CreateContainer( kShellWindowId_MouseCursorContainer, |