ARC IME: Fix crash on shutdown due to wrong focus management.

components/arc/ime/arc_ime_service.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_service.h"
 
 #include <utility>
 
 #include "base/logging.h"
 #include "base/strings/utf_string_conversions.h"
@@ skipping 66 matching lines @@
     ui::InputMethod* test_input_method) {
   test_input_method_ = test_input_method;
 }
 
 void ArcImeService::SetArcWindowDetectorForTesting(
     std::unique_ptr<ArcWindowDetector> detector) {
   arc_window_detector_ = std::move(detector);
 }
 
 ui::InputMethod* ArcImeService::GetInputMethod() {
+  if (focused_arc_window_.windows().empty())
+    return nullptr;
+
   if (test_input_method_)
     return test_input_method_;
-  if (focused_arc_window_.windows().empty())
-    return nullptr;
   return focused_arc_window_.windows().front()->GetHost()->GetInputMethod();
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // Overridden from aura::EnvObserver:
 
 void ArcImeService::OnWindowInitialized(aura::Window* new_window) {
   if (arc_window_detector_->IsArcWindow(new_window)) {
     if (!is_focus_observer_installed_) {
       exo::WMHelper::GetInstance()->AddFocusObserver(this);
       is_focus_observer_installed_ = true;
     }
   }
   keyboard::KeyboardController* keyboard_controller =
       keyboard::KeyboardController::GetInstance();
   if (keyboard_controller && keyboard_controller_ != keyboard_controller) {
     // Registering |this| as an observer only once per KeyboardController.
     keyboard_controller_ = keyboard_controller;
     keyboard_controller_->AddObserver(this);
   }
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // Overridden from exo::WMHelper::FocusChangeObserver:
 
 void ArcImeService::OnWindowFocused(aura::Window* gained_focus,
-                                   aura::Window* lost_focus) {
+                                    aura::Window* lost_focus) {
   // The Aura focus may or may not be on sub-window of the toplevel ARC++ frame.
   // To handle all cases, judge the state by always climbing up to the toplevel.
   gained_focus = gained_focus ? gained_focus->GetToplevelWindow() : nullptr;
   lost_focus = lost_focus ? lost_focus->GetToplevelWindow() : nullptr;
   if (lost_focus == gained_focus)
     return;
 
   const bool detach = (lost_focus && focused_arc_window_.Contains(lost_focus));
   const bool attach =
       (gained_focus && arc_window_detector_->IsArcTopLevelWindow(gained_focus));
+
+  // TODO(kinaba): Implicit dependency in GetInputMethod as described below is
+  // confusing. Consider getting InputMethod directly from lost_ or gained_focus
+  // variables. For that, we need to change how to inject testing InputMethod.
+  //
+  // GetInputMethod() retrieves the input method associated to
+  // |forcused_arc_window_|. Hence, to get the object we are detaching from, we
+  // must call the method before updating the forcused ARC window.
+  ui::InputMethod* const detaching_ime = detach ? GetInputMethod() : nullptr;
+
   if (detach)
     focused_arc_window_.Remove(lost_focus);
   if (attach)
     focused_arc_window_.Add(gained_focus);
 
+  ui::InputMethod* const attaching_ime = attach ? GetInputMethod() : nullptr;
+
   // Notify to the input method, either when this service is detached or
   // attached. Do nothing when the focus is moving between ARC windows,
   // to avoid unpexpected context reset in ARC.
-  ui::InputMethod* const input_method = GetInputMethod();
-  if (input_method) {
-    if (detach && !attach)
-      input_method->DetachTextInputClient(this);
-    if (!detach && attach)
-      input_method->SetFocusedTextInputClient(this);
+  if (detaching_ime != attaching_ime) {
+    if (detaching_ime)
+      detaching_ime->DetachTextInputClient(this);
+    if (attaching_ime)
+      attaching_ime->SetFocusedTextInputClient(this);
   }
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // Overridden from arc::ArcImeBridge::Delegate
 
 void ArcImeService::OnTextInputTypeChanged(ui::TextInputType type) {
   if (ime_type_ == type)
     return;
   ime_type_ = type;
@@ skipping 186 matching lines @@
     base::i18n::TextDirection direction) {
   return false;
 }
 
 bool ArcImeService::IsTextEditCommandEnabled(
     ui::TextEditCommand command) const {
   return false;
 }
 
 }  // namespace arc