Limit display of the virtual keyboard to state changes triggered from a user gesture.

ui/keyboard/keyboard_controller_unittest.cc

 // Copyright (c) 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 "base/bind.h"
 #include "base/command_line.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop/message_loop.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/aura/client/focus_client.h"
@@ skipping 200 matching lines @@
     focus_controller_.reset();
     aura_test_helper_->TearDown();
   }
 
   aura::Window* root_window() { return aura_test_helper_->root_window(); }
   KeyboardControllerProxy* proxy() { return proxy_; }
   KeyboardController* controller() { return controller_.get(); }
 
   void ShowKeyboard() {
     TestTextInputClient test_text_input_client(ui::TEXT_INPUT_TYPE_TEXT);
-    controller_->OnTextInputStateChanged(&test_text_input_client);
+    SetFocus(&test_text_input_client);
   }
 
  protected:
+  void SetFocus(ui::TextInputClient* client) {
+    ui::InputMethod* input_method = proxy()->GetInputMethod();
+    input_method->SetFocusedTextInputClient(client);
+    if (client && client->GetTextInputType() != ui::TEXT_INPUT_TYPE_NONE)
+      input_method->ShowImeIfNeeded();
+  }
+
   bool WillHideKeyboard() {
     return controller_->WillHideKeyboard();
   }
 
   base::MessageLoopForUI message_loop_;
   scoped_ptr<aura::test::AuraTestHelper> aura_test_helper_;
   scoped_ptr<TestFocusController> focus_controller_;
 
  private:
   KeyboardControllerProxy* proxy_;
@@ skipping 97 matching lines @@
 
   location.set_y(keyboard_window->bounds().y() - 5);
   ui::MouseEvent mouse2(ui::ET_MOUSE_MOVED, location, location, ui::EF_NONE,
                         ui::EF_NONE);
   EXPECT_EQ(window.get(), targeter->FindTargetForEvent(root, &mouse2));
 }
 
 TEST_F(KeyboardControllerTest, VisibilityChangeWithTextInputTypeChange) {
   const gfx::Rect& root_bounds = root_window()->bounds();
 
-  ui::InputMethod* input_method = proxy()->GetInputMethod();
   TestTextInputClient input_client_0(ui::TEXT_INPUT_TYPE_TEXT);
   TestTextInputClient input_client_1(ui::TEXT_INPUT_TYPE_TEXT);
   TestTextInputClient input_client_2(ui::TEXT_INPUT_TYPE_TEXT);
   TestTextInputClient no_input_client_0(ui::TEXT_INPUT_TYPE_NONE);
   TestTextInputClient no_input_client_1(ui::TEXT_INPUT_TYPE_NONE);
-  input_method->SetFocusedTextInputClient(&input_client_0);
 
   aura::Window* keyboard_container(controller()->GetContainerWindow());
   scoped_ptr<KeyboardContainerObserver> keyboard_container_observer(
       new KeyboardContainerObserver(keyboard_container));
   keyboard_container->SetBounds(root_bounds);
   root_window()->AddChild(keyboard_container);
 
+  SetFocus(&input_client_0);
+
   EXPECT_TRUE(keyboard_container->IsVisible());
 
-  input_method->SetFocusedTextInputClient(&no_input_client_0);
+  SetFocus(&no_input_client_0);
   // Keyboard should not immediately hide itself. It is delayed to avoid layout
   // flicker when the focus of input field quickly change.
   EXPECT_TRUE(keyboard_container->IsVisible());
   EXPECT_TRUE(WillHideKeyboard());
   // Wait for hide keyboard to finish.
   base::MessageLoop::current()->Run();
   EXPECT_FALSE(keyboard_container->IsVisible());
 
-  input_method->SetFocusedTextInputClient(&input_client_1);
+  SetFocus(&input_client_1);
   EXPECT_TRUE(keyboard_container->IsVisible());
 
   // Schedule to hide keyboard.
-  input_method->SetFocusedTextInputClient(&no_input_client_1);
+  SetFocus(&no_input_client_1);
   EXPECT_TRUE(WillHideKeyboard());
   // Cancel keyboard hide.
-  input_method->SetFocusedTextInputClient(&input_client_2);
+  SetFocus(&input_client_2);
 
   EXPECT_FALSE(WillHideKeyboard());
   EXPECT_TRUE(keyboard_container->IsVisible());
 }
 
 TEST_F(KeyboardControllerTest, AlwaysVisibleWhenLocked) {
   const gfx::Rect& root_bounds = root_window()->bounds();
 
-  ui::InputMethod* input_method = proxy()->GetInputMethod();
   TestTextInputClient input_client_0(ui::TEXT_INPUT_TYPE_TEXT);
   TestTextInputClient input_client_1(ui::TEXT_INPUT_TYPE_TEXT);
   TestTextInputClient no_input_client_0(ui::TEXT_INPUT_TYPE_NONE);
   TestTextInputClient no_input_client_1(ui::TEXT_INPUT_TYPE_NONE);
-  input_method->SetFocusedTextInputClient(&input_client_0);
 
   aura::Window* keyboard_container(controller()->GetContainerWindow());
   scoped_ptr<KeyboardContainerObserver> keyboard_container_observer(
       new KeyboardContainerObserver(keyboard_container));
   keyboard_container->SetBounds(root_bounds);
   root_window()->AddChild(keyboard_container);
 
+  SetFocus(&input_client_0);
+
   EXPECT_TRUE(keyboard_container->IsVisible());
 
   // Lock keyboard.
   controller()->set_lock_keyboard(true);
 
-  input_method->SetFocusedTextInputClient(&no_input_client_0);
+  SetFocus(&no_input_client_0);
   // Keyboard should not try to hide itself as it is locked.
   EXPECT_TRUE(keyboard_container->IsVisible());
   EXPECT_FALSE(WillHideKeyboard());
 
-  input_method->SetFocusedTextInputClient(&input_client_1);
+  SetFocus(&input_client_1);
   EXPECT_TRUE(keyboard_container->IsVisible());
 
   // Unlock keyboard.
   controller()->set_lock_keyboard(false);
 
   // Keyboard should hide when focus on no input client.
-  input_method->SetFocusedTextInputClient(&no_input_client_1);
+  SetFocus(&no_input_client_1);
   EXPECT_TRUE(WillHideKeyboard());
 
   // Wait for hide keyboard to finish.
   base::MessageLoop::current()->Run();
   EXPECT_FALSE(keyboard_container->IsVisible());
 }
 
 TEST_F(KeyboardControllerTest, KeyboardResizingFromContents) {
   aura::Window* keyboard_container = controller()->GetContainerWindow();
   aura::Window* keyboard_window = proxy()->GetKeyboardWindow();
@@ skipping 33 matching lines @@
     KeyboardControllerTest::SetUp();
   }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(KeyboardControllerUsabilityTest);
 };
 
 TEST_F(KeyboardControllerUsabilityTest, KeyboardAlwaysVisibleInUsabilityTest) {
   const gfx::Rect& root_bounds = root_window()->bounds();
 
-  ui::InputMethod* input_method = proxy()->GetInputMethod();
   TestTextInputClient input_client(ui::TEXT_INPUT_TYPE_TEXT);
   TestTextInputClient no_input_client(ui::TEXT_INPUT_TYPE_NONE);
-  input_method->SetFocusedTextInputClient(&input_client);
 
   aura::Window* keyboard_container(controller()->GetContainerWindow());
   keyboard_container->SetBounds(root_bounds);
   root_window()->AddChild(keyboard_container);
 
+  SetFocus(&input_client);
   EXPECT_TRUE(keyboard_container->IsVisible());
 
-  input_method->SetFocusedTextInputClient(&no_input_client);
+  SetFocus(&no_input_client);
   // Keyboard should not hide itself after lost focus.
   EXPECT_TRUE(keyboard_container->IsVisible());
   EXPECT_FALSE(WillHideKeyboard());
 }
 
 }  // namespace keyboard