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

Unified Diff: ash/root_window_controller.cc

Issue 565373002: Move virtual keyboard behind context menus. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Code cleanup. Created 6 years, 3 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
« no previous file with comments | « no previous file | ash/root_window_controller_unittest.cc » ('j') | ash/root_window_controller_unittest.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/root_window_controller.cc
diff --git a/ash/root_window_controller.cc b/ash/root_window_controller.cc
index eb97d251e9c807a27bc719f7913657b2691a61c8..ab31dbbd8c50151c16e3f3de3d9ffb421b3e6aa4 100644
--- a/ash/root_window_controller.cc
+++ b/ash/root_window_controller.cc
@@ -1021,6 +1021,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",
@@ -1044,14 +1052,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,
« no previous file with comments | « no previous file | ash/root_window_controller_unittest.cc » ('j') | ash/root_window_controller_unittest.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698