ARC: Show virtual keyboard when necessary on text input type change events.

components/arc/ime/arc_ime_bridge.cc

 // Copyright 2016 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 "components/arc/ime/arc_ime_bridge.h"
 
 #include "base/logging.h"
 #include "components/arc/ime/arc_ime_ipc_host_impl.h"
 #include "ui/aura/client/focus_client.h"
 #include "ui/aura/env.h"
@@ skipping 17 matching lines @@
 
 }  // namespace
 
 ////////////////////////////////////////////////////////////////////////////////
 // ArcImeBridge main implementation:
 
 ArcImeBridge::ArcImeBridge(ArcBridgeService* bridge_service)
     : ArcService(bridge_service),
       ipc_host_(new ArcImeIpcHostImpl(this, bridge_service)),
       ime_type_(ui::TEXT_INPUT_TYPE_NONE),
-      has_composition_text_(false) {
+      has_composition_text_(false),
+      test_input_method_(nullptr) {
   aura::Env* env = aura::Env::GetInstanceDontCreate();
   if (env)
     env->AddObserver(this);
 }
 
 ArcImeBridge::~ArcImeBridge() {
   ui::InputMethod* const input_method = GetInputMethod();
   if (input_method)
     input_method->DetachTextInputClient(this);
 
   for (aura::Window* window : arc_windows_.windows())
     window->RemoveObserver(this);
   for (aura::Window* root : observing_root_windows_.windows())
     aura::client::GetFocusClient(root)->RemoveObserver(this);
   aura::Env* env = aura::Env::GetInstanceDontCreate();
   if (env)
     env->RemoveObserver(this);
 }
 
 void ArcImeBridge::SetIpcHostForTesting(
     scoped_ptr<ArcImeIpcHost> test_ipc_host) {
   ipc_host_ = std::move(test_ipc_host);
 }
 
+void ArcImeBridge::SetInputMethodForTesting(
+    ui::InputMethod* test_input_method) {
+  test_input_method_ = test_input_method;
+}
+
 ui::InputMethod* ArcImeBridge::GetInputMethod() {
+  if (test_input_method_)
+    return test_input_method_;
   if (!focused_arc_window_.has_windows())
     return nullptr;
   return focused_arc_window_.windows().front()->GetHost()->GetInputMethod();
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // Overridden from aura::EnvObserver:
 
 void ArcImeBridge::OnWindowInitialized(aura::Window* new_window) {
   if (IsArcWindow(new_window)) {
@@ skipping 33 matching lines @@
 
 ////////////////////////////////////////////////////////////////////////////////
 // Overridden from arc::ArcImeIpcHost::Delegate
 
 void ArcImeBridge::OnTextInputTypeChanged(ui::TextInputType type) {
   if (ime_type_ == type)
     return;
   ime_type_ = type;
 
   ui::InputMethod* const input_method = GetInputMethod();
-  if (input_method)
+  if (input_method) {
     input_method->OnTextInputTypeChanged(this);
+    if (input_method->GetTextInputClient() == this &&

[hidehiko, 2016/01/26 08:05:53]

IMHO, this should work, and practically cover most use cases. However, an ideal
solution would be wire show-/hide-IME events between ChromeOS and IMF in
Android.

So, how about submitting this as a short term solution (because this looks small
enough), and filing a bug for long term proper solution with TODO comments?

[kinaba, 2016/01/26 08:28:59]

You're right. Added the TODO comment as suggested.

+        ime_type_ != ui::TEXT_INPUT_TYPE_NONE) {
+      input_method->ShowImeIfNeeded();
+    }
+  }
 }
 
 void ArcImeBridge::OnCursorRectChanged(const gfx::Rect& rect) {
   if (cursor_rect_ == rect)
     return;
   cursor_rect_ = rect;
 
   ui::InputMethod* const input_method = GetInputMethod();
   if (input_method)
     input_method->OnCaretBoundsChanged(this);
@@ skipping 96 matching lines @@
 bool ArcImeBridge::ChangeTextDirectionAndLayoutAlignment(
     base::i18n::TextDirection direction) {
   return false;
 }
 
 bool ArcImeBridge::IsEditCommandEnabled(int command_id) {
   return false;
 }
 
 }  // namespace arc