From b2da9b606286f651cf45d9312fa5ed8e2ca9c401 Mon Sep 17 00:00:00 2001 From: "hshi@chromium.org" Date: Wed, 5 Mar 2014 18:39:52 +0000 Subject: Make Chrome OS virtual keyboard to work with cursor compositing. Explicitly define container IDs for the parent container of the virtual keyboard, as well as the mouse cursor container. This is to ensure the correct ordering in which containers are stacked together. Specifically the virtual keyboard parent container should be above all non-lock screen, lock screen and lock screen related containers, but below the mouse cursor container, which sits immediately below the power animation container. BUG=347304 TEST=trybots and manual verification. R=kevers@chromium.org, oshima@chromium.org Review URL: https://codereview.chromium.org/186673008 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@255096 0039d316-1c4b-4281-b951-d872f2087c98 --- ash/shell_window_ids.h | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (limited to 'ash/shell_window_ids.h') diff --git a/ash/shell_window_ids.h b/ash/shell_window_ids.h index ab5fd23..aedc8b5 100644 --- a/ash/shell_window_ids.h +++ b/ash/shell_window_ids.h @@ -99,8 +99,16 @@ const int kShellWindowId_OverlayContainer = 22; // ID of the window created by PhantomWindowController or DragWindowController. const int kShellWindowId_PhantomWindow = 23; +// A parent container that holds the virtual keyboard container. This is to +// ensure that the virtual keyboard is stacked above most containers but below +// the mouse cursor and the power off animation. +const int kShellWindowId_VirtualKeyboardParentContainer = 24; + +// The container for mouse cursor. +const int kShellWindowId_MouseCursorContainer = 25; + // The topmost container, used for power off animation. -const int kShellWindowId_PowerButtonAnimationContainer = 24; +const int kShellWindowId_PowerButtonAnimationContainer = 26; } // namespace internal -- cgit v1.1