Chromium Code Reviews| Index: ash/root_window_controller.cc |
| diff --git a/ash/root_window_controller.cc b/ash/root_window_controller.cc |
| index 0e07dbe03e94cafc518cad419a90bb223e21f37c..c2eb1435d07b66b1a4330be17a71cada0bedcf87 100644 |
| --- a/ash/root_window_controller.cc |
| +++ b/ash/root_window_controller.cc |
| @@ -1018,6 +1018,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); |
|
James Cook
2014/09/12 22:01:52
Just to double-check -- the virtual keyboard still
kevers
2014/09/15 17:23:45
Confirmed that the lock screen is well behaved.
|
| + wm::SetSnapsChildrenToPhysicalPixelBoundary( |
| + virtual_keyboard_parent_container); |
| + SetUsesScreenCoordinates(virtual_keyboard_parent_container); |
| + |
| aura::Window* menu_container = CreateContainer( |
| kShellWindowId_MenuContainer, |
| "MenuContainer", |
| @@ -1041,14 +1049,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, |