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

Unified Diff: ash/display/virtual_keyboard_window_controller_unittest.cc

Issue 574033003: Remove keyboard usability mode (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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
Index: ash/display/virtual_keyboard_window_controller_unittest.cc
diff --git a/ash/display/virtual_keyboard_window_controller_unittest.cc b/ash/display/virtual_keyboard_window_controller_unittest.cc
deleted file mode 100644
index e2538c1e5b74e21881e42c52c5504efb3e8c4261..0000000000000000000000000000000000000000
--- a/ash/display/virtual_keyboard_window_controller_unittest.cc
+++ /dev/null
@@ -1,97 +0,0 @@
-// Copyright 2013 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/display/virtual_keyboard_window_controller.h"
-
-#include "ash/ash_switches.h"
-#include "ash/display/display_controller.h"
-#include "ash/root_window_controller.h"
-#include "ash/shell.h"
-#include "ash/shell_window_ids.h"
-#include "ash/test/ash_test_base.h"
-#include "ash/wm/maximize_mode/maximize_mode_controller.h"
-#include "base/command_line.h"
-#include "ui/keyboard/keyboard_switches.h"
-#include "ui/keyboard/keyboard_util.h"
-
-namespace ash {
-namespace test {
-
-class VirtualKeyboardWindowControllerTest : public AshTestBase {
- public:
- VirtualKeyboardWindowControllerTest()
- : virtual_keyboard_window_controller_(NULL) {}
- virtual ~VirtualKeyboardWindowControllerTest() {}
-
- void set_virtual_keyboard_window_controller(
- VirtualKeyboardWindowController* controller) {
- virtual_keyboard_window_controller_ = controller;
- }
-
- RootWindowController* root_window_controller() {
- return virtual_keyboard_window_controller_->
- root_window_controller_for_test();
- }
-
- private:
- VirtualKeyboardWindowController* virtual_keyboard_window_controller_;
- DISALLOW_COPY_AND_ASSIGN(VirtualKeyboardWindowControllerTest);
-};
-
-class VirtualKeyboardUsabilityExperimentTest
- : public VirtualKeyboardWindowControllerTest {
- public:
- VirtualKeyboardUsabilityExperimentTest()
- : VirtualKeyboardWindowControllerTest() {}
- virtual ~VirtualKeyboardUsabilityExperimentTest() {}
-
- virtual void SetUp() OVERRIDE {
- if (SupportsMultipleDisplays()) {
- CommandLine::ForCurrentProcess()->AppendSwitchASCII(
- switches::kAshHostWindowBounds, "1+1-300x300,1+301-300x300");
- CommandLine::ForCurrentProcess()->AppendSwitch(
- keyboard::switches::kKeyboardUsabilityExperiment);
- }
- test::AshTestBase::SetUp();
- }
-
- private:
- DISALLOW_COPY_AND_ASSIGN(VirtualKeyboardUsabilityExperimentTest);
-};
-
-TEST_F(VirtualKeyboardUsabilityExperimentTest, VirtualKeyboardWindowTest) {
- if (!SupportsMultipleDisplays())
- return;
- RunAllPendingInMessageLoop();
- set_virtual_keyboard_window_controller(
- Shell::GetInstance()->display_controller()->
- virtual_keyboard_window_controller());
- EXPECT_TRUE(root_window_controller());
- aura::Window* container = root_window_controller()->GetContainer(
- kShellWindowId_VirtualKeyboardContainer);
- // Keyboard container is added to virtual keyboard window and its bounds is
- // the same as root window.
- EXPECT_TRUE(container);
- EXPECT_EQ(container->bounds(),
- root_window_controller()->GetRootWindow()->bounds());
-}
-
-// Tests that the onscreen keyboard becomes enabled when maximize mode is
-// enabled.
-TEST_F(VirtualKeyboardWindowControllerTest, EnabledDuringMaximizeMode) {
- set_virtual_keyboard_window_controller(
- Shell::GetInstance()->display_controller()->
- virtual_keyboard_window_controller());
-
- 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

Powered by Google App Engine
This is Rietveld 408576698