diff options
| author | hshi@chromium.org <hshi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-05 18:39:52 +0000 |
|---|---|---|
| committer | hshi@chromium.org <hshi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-05 18:39:52 +0000 |
| commit | b2da9b606286f651cf45d9312fa5ed8e2ca9c401 (patch) | |
| tree | 4c7b561c712ee3247e94402b42476d9d3825cfb2 /ash/shell_unittest.cc | |
| parent | e82abea5720382429c29c2691d4d17e0719185da (diff) | |
| download | chromium_src-b2da9b606286f651cf45d9312fa5ed8e2ca9c401.zip chromium_src-b2da9b606286f651cf45d9312fa5ed8e2ca9c401.tar.gz chromium_src-b2da9b606286f651cf45d9312fa5ed8e2ca9c401.tar.bz2 | |
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
Diffstat (limited to 'ash/shell_unittest.cc')
| -rw-r--r-- | ash/shell_unittest.cc | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/ash/shell_unittest.cc b/ash/shell_unittest.cc index 7dd9246..160d6b4 100644 --- a/ash/shell_unittest.cc +++ b/ash/shell_unittest.cc @@ -87,6 +87,12 @@ void ExpectAllContainers() { root_window, internal::kShellWindowId_SettingBubbleContainer)); EXPECT_TRUE(Shell::GetContainer( root_window, internal::kShellWindowId_OverlayContainer)); + EXPECT_TRUE(Shell::GetContainer( + root_window, internal::kShellWindowId_VirtualKeyboardParentContainer)); +#if defined(OS_CHROMEOS) + EXPECT_TRUE(Shell::GetContainer( + root_window, internal::kShellWindowId_MouseCursorContainer)); +#endif } class ModalWindow : public views::WidgetDelegateView { |