Fix Virtual Keyboard not being deployed in TouchView mode on Ozone.

ash/virtual_keyboard_controller_unittest.cc

 // 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 <vector>
 
 #include "ash/shell.h"
 #include "ash/system/chromeos/virtual_keyboard/virtual_keyboard_observer.h"
@@ skipping 136 matching lines @@
   // Whether the observer method was called.
   bool notified_;
 
   // Whether the keeyboard is suppressed.
   bool suppressed_;
 
   DISALLOW_COPY_AND_ASSIGN(VirtualKeyboardControllerAutoTest);
 };
 
 // Tests that the onscreen keyboard is disabled if an internal keyboard is
 // present.

[pkotwicz, 2015/03/02 20:35:57]

Maybe update this comment?

[rsadam, 2015/03/02 22:01:37]

Done.

 TEST_F(VirtualKeyboardControllerAutoTest, DisabledIfInternalKeyboardPresent) {
   std::vector<ui::TouchscreenDevice> screens;
   screens.push_back(ui::TouchscreenDevice(
       1, ui::InputDeviceType::INPUT_DEVICE_INTERNAL, gfx::Size(1024, 768), 0));
   UpdateTouchscreenDevices(screens);
   std::vector<ui::KeyboardDevice> keyboards;
   keyboards.push_back(
       ui::KeyboardDevice(1, ui::InputDeviceType::INPUT_DEVICE_INTERNAL));
   UpdateKeyboardDevices(keyboards);
   ASSERT_FALSE(keyboard::IsKeyboardEnabled());
@@ skipping 60 matching lines @@
   keyboards.push_back(
       ui::KeyboardDevice(1, ui::InputDeviceType::INPUT_DEVICE_INTERNAL));
   keyboards.push_back(
       ui::KeyboardDevice(2, ui::InputDeviceType::INPUT_DEVICE_EXTERNAL));
   keyboards.push_back(
       ui::KeyboardDevice(3, ui::InputDeviceType::INPUT_DEVICE_EXTERNAL));
   UpdateKeyboardDevices(keyboards);
   ASSERT_FALSE(keyboard::IsKeyboardEnabled());
 }
 
+// Tests maximized mode interaction without disabling the internal keyboard.

[pkotwicz, 2015/03/02 20:35:57]

A test that the virtual keyboard is surpressed if an external keyboard is
present and maximized mode is enabled might be useful

[rsadam, 2015/03/02 22:01:37]

Done.

+TEST_F(VirtualKeyboardControllerAutoTest, EnabledDuringMaximizeMode) {
+  std::vector<ui::TouchscreenDevice> screens;
+  screens.push_back(ui::TouchscreenDevice(
+      1, ui::InputDeviceType::INPUT_DEVICE_INTERNAL, gfx::Size(1024, 768), 0));
+  UpdateTouchscreenDevices(screens);
+  std::vector<ui::KeyboardDevice> keyboards;
+  keyboards.push_back(
+      ui::KeyboardDevice(1, ui::InputDeviceType::INPUT_DEVICE_INTERNAL));
+  UpdateKeyboardDevices(keyboards);
+  ASSERT_FALSE(keyboard::IsKeyboardEnabled());
+  // Toggle maximized mode on.
+  Shell::GetInstance()
+      ->maximize_mode_controller()
+      ->EnableMaximizeModeWindowManager(true);
+  ASSERT_TRUE(keyboard::IsKeyboardEnabled());
+  // Toggle maximized mode off.
+  Shell::GetInstance()
+      ->maximize_mode_controller()
+      ->EnableMaximizeModeWindowManager(false);
+  ASSERT_FALSE(keyboard::IsKeyboardEnabled());
+}
+
 class VirtualKeyboardControllerAlwaysEnabledTest
     : public VirtualKeyboardControllerAutoTest {
  public:
   VirtualKeyboardControllerAlwaysEnabledTest()
       : VirtualKeyboardControllerAutoTest() {}
   ~VirtualKeyboardControllerAlwaysEnabledTest() override {}
 
   void SetUp() override {
     base::CommandLine::ForCurrentProcess()->AppendSwitch(
         keyboard::switches::kEnableVirtualKeyboard);
@@ skipping 13 matching lines @@
   UpdateTouchscreenDevices(screens);
   std::vector<ui::KeyboardDevice> keyboards;
   keyboards.push_back(
       ui::KeyboardDevice(1, ui::InputDeviceType::INPUT_DEVICE_EXTERNAL));
   UpdateKeyboardDevices(keyboards);
   ASSERT_TRUE(keyboard::IsKeyboardEnabled());
 }
 
 }  // namespace test
 }  // namespace ash