diff options
author | bshe <bshe@chromium.org> | 2014-09-22 16:16:52 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2014-09-22 23:17:05 +0000 |
commit | eaae09a093fc4c3d4ac8ba0f36e367e8a3dc7378 (patch) | |
tree | f73cd7542e583df4201d33ace2b5e05e5c85c78e /ash/virtual_keyboard_controller_unittest.cc | |
parent | beec6a363b7ec3751a83566beaa6f8565e709bad (diff) | |
download | chromium_src-eaae09a093fc4c3d4ac8ba0f36e367e8a3dc7378.zip chromium_src-eaae09a093fc4c3d4ac8ba0f36e367e8a3dc7378.tar.gz chromium_src-eaae09a093fc4c3d4ac8ba0f36e367e8a3dc7378.tar.bz2 |
Enable virtual keyboard in overview mode
Touch view uses virtual_keyboard_window_controller to enable/disable
virtual keyboard. However, virtual_keyboard_window_controller is specific
for a Touch Usability mode which nobody uses and is removed. This CL adds a
VirtualKeyboardObserver to replace virtual_keyboard_window_controller.
BUG=416495
Review URL: https://codereview.chromium.org/592753004
Cr-Commit-Position: refs/heads/master@{#296086}
Diffstat (limited to 'ash/virtual_keyboard_controller_unittest.cc')
-rw-r--r-- | ash/virtual_keyboard_controller_unittest.cc | 30 |
1 files changed, 30 insertions, 0 deletions
diff --git a/ash/virtual_keyboard_controller_unittest.cc b/ash/virtual_keyboard_controller_unittest.cc new file mode 100644 index 0000000..8072b84 --- /dev/null +++ b/ash/virtual_keyboard_controller_unittest.cc @@ -0,0 +1,30 @@ +// Copyright 2014 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +#include "ash/virtual_keyboard_controller.h" + +#include "ash/shell.h" +#include "ash/test/ash_test_base.h" +#include "ash/wm/maximize_mode/maximize_mode_controller.h" +#include "ui/keyboard/keyboard_util.h" + +namespace ash { +namespace test { + +typedef AshTestBase VirtualKeyboardControllerTest; + +// Tests that the onscreen keyboard becomes enabled when maximize mode is +// enabled. +TEST_F(VirtualKeyboardControllerTest, EnabledDuringMaximizeMode) { + ASSERT_FALSE(keyboard::IsKeyboardEnabled()); + Shell::GetInstance()->maximize_mode_controller()-> + EnableMaximizeModeWindowManager(true); + EXPECT_TRUE(keyboard::IsKeyboardEnabled()); + Shell::GetInstance()->maximize_mode_controller()-> + EnableMaximizeModeWindowManager(false); + EXPECT_FALSE(keyboard::IsKeyboardEnabled()); +} + +} // namespace test +} // namespace ash |