Refactoring the ownership of ui::InputMethod.

chrome/browser/chromeos/input_method/input_method_engine.cc

 // Copyright 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 "chrome/browser/chromeos/input_method/input_method_engine.h"
 
 #undef FocusIn
 #undef FocusOut
 #undef RootWindow
 #include <map>
 
 #include "ash/shell.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/metrics/histogram.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "ui/aura/window.h"
 #include "ui/aura/window_tree_host.h"
 #include "ui/base/ime/candidate_window.h"
 #include "ui/base/ime/chromeos/component_extension_ime_manager.h"
 #include "ui/base/ime/chromeos/composition_text_chromeos.h"
 #include "ui/base/ime/chromeos/extension_ime_util.h"
 #include "ui/base/ime/chromeos/ime_keymap.h"
 #include "ui/base/ime/chromeos/input_method_manager.h"
+#include "ui/base/ime/input_method.h"
 #include "ui/base/ime/text_input_flags.h"
 #include "ui/chromeos/ime/input_method_menu_item.h"
 #include "ui/chromeos/ime/input_method_menu_manager.h"
 #include "ui/events/event.h"
 #include "ui/events/event_processor.h"
 #include "ui/events/event_utils.h"
 #include "ui/events/keycodes/dom/dom_code.h"
 #include "ui/events/keycodes/dom/keycode_converter.h"
 #include "ui/keyboard/keyboard_controller.h"
 #include "ui/keyboard/keyboard_util.h"
@@ skipping 245 matching lines @@
     const std::vector<KeyboardEvent>& events) {
   if (!IsActive()) {
     return false;
   }
   // context_id  ==  0, means sending key events to non-input field.
   // context_id_ == -1, means the focus is not in an input field.
   if (context_id != 0 && (context_id != context_id_ || context_id_ == -1)) {
     return false;
   }
 
-  ui::EventProcessor* dispatcher =
-      ash::Shell::GetPrimaryRootWindow()->GetHost()->event_processor();
+  ui::InputMethod* input_method =

[sky, 2015/06/04 13:40:28]

Is there a reason you need to explicitly call through to the InputMethod here
and not the dispatcher as before? Shouldn't the later still work?

[Shu Chen, 2015/06/04 15:59:25]

The dispatcher->OnEventFromSource() now doesn't work because it happens after
IME.
The EventSource::SendEventToProcessor() happens before IME but it is protected.
Should make it as public?

[sky, 2015/06/04 19:42:52]

No, keep it as you have it.

+      ash::Shell::GetTargetRootWindow()->GetHost()->GetInputMethod();
 
   for (size_t i = 0; i < events.size(); ++i) {
     const KeyboardEvent& event = events[i];
     const ui::EventType type =
         (event.type == "keyup") ? ui::ET_KEY_RELEASED : ui::ET_KEY_PRESSED;
     ui::KeyboardCode key_code = static_cast<ui::KeyboardCode>(event.key_code);
     if (key_code == ui::VKEY_UNKNOWN)
       key_code = ui::DomKeycodeToKeyboardCode(event.code);
 
     int flags = ui::EF_NONE;
@@ skipping 10 matching lines @@
       if (key_char.size() == 1)
         ch = key_char[0];
     }
     ui::KeyEvent ui_event(
         type, key_code,
         ui::KeycodeConverter::CodeStringToDomCode(event.code.c_str()), flags,
         ui::KeycodeConverter::KeyStringToDomKey(event.key.c_str()), ch,
         ui::EventTimeForNow());
     base::AutoReset<const ui::KeyEvent*> reset_sent_key(&sent_key_event_,
                                                         &ui_event);
-    ui::EventDispatchDetails details = dispatcher->OnEventFromSource(&ui_event);
-    if (details.dispatcher_destroyed)
-      break;
+    input_method->DispatchKeyEvent(ui_event);
   }
 
   return true;
 }
 
 const InputMethodEngine::CandidateWindowProperty&
 InputMethodEngine::GetCandidateWindowProperty() const {
   return candidate_window_property_;
 }
 
@@ skipping 368 matching lines @@
           // TODO(nona): Implement it.
           break;
       }
     }
   }
 
   // TODO(nona): Support item.children.
 }
 
 }  // namespace chromeos