Refactoring the ownership of ui::InputMethod.

ash/shell.cc

Index: ash/shell.cc
diff --git a/ash/shell.cc b/ash/shell.cc
index fb61b55893a6e7c274829105a75bea1f9966b97d..c23472a58167e3573d4e46dd27f074b3b11bf645 100644
--- a/ash/shell.cc
+++ b/ash/shell.cc
@@ -108,7 +108,6 @@
 #include "ui/wm/core/accelerator_filter.h"
 #include "ui/wm/core/compound_event_filter.h"
 #include "ui/wm/core/focus_controller.h"
-#include "ui/wm/core/input_method_event_filter.h"
 #include "ui/wm/core/nested_accelerator_controller.h"
 #include "ui/wm/core/shadow_controller.h"
 #include "ui/wm/core/visibility_controller.h"
@@ -680,7 +679,6 @@ Shell::~Shell() {
   speech_feedback_handler_.reset();
 #endif
   RemovePreTargetHandler(overlay_filter_.get());
-  RemovePreTargetHandler(input_method_filter_.get());
   RemovePreTargetHandler(accelerator_filter_.get());
   RemovePreTargetHandler(event_transformation_handler_.get());
   RemovePreTargetHandler(toplevel_window_event_handler_.get());
@@ -753,6 +751,8 @@ Shell::~Shell() {
   // and has window observers.
   shelf_window_watcher_.reset();
 
+  keyboard::KeyboardController::ResetInstance(nullptr);

[James Cook, 2015/06/02 16:29:12]

Does this need to be done here or can it be done closer to the destruction of
DisplayController?  (I'm a little nervous about moving it, as there's a lot of
cleanup happening between the new and old locations.)

[Shu Chen, 2015/06/03 03:31:54]

I recall I changed this due to some test failures during the refactoring, but
later I figured out the test failures were caused by other things. So probably
the change here can be reverted. Let me try and see the whether trybots will be
green.

[Shu Chen, 2015/06/03 07:29:57]

The trybots are green. :)

+
   // Destroy all child windows including widgets.
   display_controller_->CloseChildWindows();
   // MruWindowTracker must be destroyed after all windows have been deleted to
@@ -809,8 +809,6 @@ Shell::~Shell() {
   new_window_delegate_.reset();
   media_delegate_.reset();
 
-  keyboard::KeyboardController::ResetInstance(NULL);
-
 #if defined(OS_CHROMEOS)
   display_color_manager_.reset();
   if (display_change_observer_)
@@ -935,10 +933,6 @@ void Shell::Init(const ShellInitParams& init_params) {
   AddPreTargetHandler(overlay_filter_.get());
   AddShellObserver(overlay_filter_.get());
 
-  input_method_filter_.reset(new ::wm::InputMethodEventFilter(
-      root_window->GetHost()->GetAcceleratedWidget()));
-  AddPreTargetHandler(input_method_filter_.get());
-
   accelerator_filter_.reset(new ::wm::AcceleratorFilter(
       scoped_ptr< ::wm::AcceleratorDelegate>(new AcceleratorDelegate).Pass(),
       accelerator_controller_->accelerator_history()));
@@ -1110,7 +1104,6 @@ void Shell::InitRootWindow(aura::Window* root_window) {
   DCHECK(drag_drop_controller_.get());
 
   aura::client::SetFocusClient(root_window, focus_client_.get());
-  input_method_filter_->SetInputMethodPropertyInRootWindow(root_window);
   aura::client::SetActivationClient(root_window, activation_client_);
   ::wm::FocusController* focus_controller =
       static_cast< ::wm::FocusController*>(activation_client_);