Hide the virtual keyboard in OnTextInputTypeChanged().

Before this CL, RequestHideIme() was called by Android side just after
the call of OnTextInputTypeChanged().
However, the interval between the call of OnTextInputTypeChanged() and
the call of RequestHideIme() can be larger than the length of the
animation of showing the virtual keyboard.
When it happens, the bounds of the shown virtual keyboard is notified to
Android side by OnKeyboardAppearanceChanged() and it causes confusion.
This CL fixes it by calling HideKeyboardImplicitlyBySystem() in
OnTextInputTypeChanged() and marks RequestHideIme() mojo call as
deprecated because it's not needed anymore.

Bug: b/148483295
Bug: 1023656
Change-Id: I32c46c18949323c0a33a26dd10a18e2e38cc277a
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2089434Reviewed-by: Tetsui Ohkubo <tetsui@chromium.org>
Reviewed-by: Dominick Ng <dominickn@chromium.org>
Commit-Queue: Yuichiro Hanada <yhanada@chromium.org>
Cr-Commit-Position: refs/heads/master@{#748518}

components/arc/ime/arc_ime_bridge.h

@@ -42,7 +42,6 @@ class ArcImeBridge {
         const base::string16& text_in_range,
         const gfx::Range& selection_range,
         bool is_screen_coordinates) = 0;
-    virtual void RequestHideIme() = 0;
   };
 
   // Serializes and sends IME related requests through IPCs.

components/arc/ime/arc_ime_bridge_impl.cc

@@ -150,8 +150,8 @@ void ArcImeBridgeImpl::OnCursorRectChangedWithSurroundingText(
       is_screen_coordinates);
 }
 
-void ArcImeBridgeImpl::RequestHideIme() {
-  delegate_->RequestHideIme();
+void ArcImeBridgeImpl::RequestHideImeDeprecated() {
+  DVLOG(1) << "RequestHideIme is deprecated.";
 }
 
 }  // namespace arc

components/arc/ime/arc_ime_bridge_impl.h

@@ -51,7 +51,7 @@ class ArcImeBridgeImpl : public ArcImeBridge, public mojom::ImeHost {
                                               const std::string& text_in_range,
                                               const gfx::Range& selection_range,
                                               bool screen_coordinates) override;
-  void RequestHideIme() override;
+  void RequestHideImeDeprecated() override;
 
  private:
   Delegate* const delegate_;

components/arc/ime/arc_ime_service.cc

@@ -311,6 +311,16 @@ void ArcImeService::OnTextInputTypeChanged(
   ui::InputMethod* const input_method = GetInputMethod();
   if (input_method)
     input_method->OnTextInputTypeChanged(this);
+
+  // Call HideKeyboard() here. On a text field on an ARC++ app, just having
+  // non-null text input type doesn't mean the virtual keyboard is necessary. If
+  // the virtual keyboard is really needed, ShowVirtualKeyboardIfEnabled will be
+  // called later.
+  if (keyboard::KeyboardUIController::HasInstance()) {
+    auto* keyboard_controller = keyboard::KeyboardUIController::Get();
+    if (keyboard_controller->IsEnabled())
+      keyboard_controller->HideKeyboardImplicitlyBySystem();
+  }
 }
 
 void ArcImeService::OnCursorRectChanged(const gfx::Rect& rect,
@@ -356,18 +366,6 @@ void ArcImeService::OnCursorRectChangedWithSurroundingText(
     input_method->OnCaretBoundsChanged(this);
 }
 
-void ArcImeService::RequestHideIme() {
-  // Ignore the request when the ARC app is not focused.
-  if (!focused_arc_window_)
-    return;
-
-  if (keyboard::KeyboardUIController::HasInstance()) {
-    auto* keyboard_controller = keyboard::KeyboardUIController::Get();
-    if (keyboard_controller->IsEnabled())
-      keyboard_controller->HideKeyboardImplicitlyBySystem();
-  }
-}
-
 ////////////////////////////////////////////////////////////////////////////////
 // Overridden from ash::KeyboardControllerObserver
 void ArcImeService::OnKeyboardAppearanceChanged(

components/arc/ime/arc_ime_service.h

@@ -104,7 +104,6 @@ class ArcImeService : public KeyedService,
       const base::string16& text_in_range,
       const gfx::Range& selection_range,
       bool is_screen_coordinates) override;
-  void RequestHideIme() override;
 
   // Overridden from ash::KeyboardControllerObserver.
   void OnKeyboardAppearanceChanged(

components/arc/mojom/ime.mojom

@@ -90,10 +90,8 @@ interface ImeHost {
       );
 
   // Requests Chrome to hide the virtual keyboard.
-  // Howver, hiding can be canceled if a text field gets focus.
-  // TODO(yhanada): We might be able to remove this method by adding an argument
-  //                to OnTextInputTypeChanged().
-  [MinVersion=9] RequestHideIme@5();
+  // However, hiding can be canceled if a text field gets focus.
+  [MinVersion=9] RequestHideImeDeprecated@5();
 };
 
 // Next method ID: 8