IME (input method editor) support for Aura, part 3 of 3: Use ui::InputMethod in ash.

ui/aura_shell/shell.cc

 // Copyright (c) 2011 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 "ui/aura_shell/shell.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "ui/aura/aura_switches.h"
 #include "ui/aura/client/aura_constants.h"
 #include "ui/aura/client/drag_drop_client.h"
+#include "ui/aura/layout_manager.h"
 #include "ui/aura/root_window.h"
-#include "ui/aura/layout_manager.h"
 #include "ui/aura/window.h"
 #include "ui/aura/window_types.h"
 #include "ui/aura_shell/app_list.h"
 #include "ui/aura_shell/default_container_event_filter.h"
 #include "ui/aura_shell/default_container_layout_manager.h"
+#include "ui/aura_shell/drag_drop_controller.h"
+#include "ui/aura_shell/input_method_event_filter.h"
+#include "ui/aura_shell/launcher/launcher.h"
+#include "ui/aura_shell/modal_container_layout_manager.h"
 #include "ui/aura_shell/root_window_event_filter.h"
 #include "ui/aura_shell/root_window_layout_manager.h"
-#include "ui/aura_shell/drag_drop_controller.h"
-#include "ui/aura_shell/launcher/launcher.h"
-#include "ui/aura_shell/modal_container_layout_manager.h"
 #include "ui/aura_shell/shadow_controller.h"
 #include "ui/aura_shell/shelf_layout_manager.h"
 #include "ui/aura_shell/shell_accelerator_controller.h"
 #include "ui/aura_shell/shell_accelerator_filter.h"
 #include "ui/aura_shell/shell_delegate.h"
 #include "ui/aura_shell/shell_factory.h"
 #include "ui/aura_shell/shell_tooltip_manager.h"
 #include "ui/aura_shell/shell_window_ids.h"
 #include "ui/aura_shell/stacking_controller.h"
 #include "ui/aura_shell/status_area_layout_manager.h"
@@ skipping 81 matching lines @@
     : ALLOW_THIS_IN_INITIALIZER_LIST(method_factory_(this)),
       accelerator_controller_(new ShellAcceleratorController),
       delegate_(delegate) {
   aura::RootWindow::GetInstance()->SetEventFilter(
       new internal::RootWindowEventFilter);
   aura::RootWindow::GetInstance()->SetStackingClient(
       new internal::StackingController);
 }
 
 Shell::~Shell() {
+  RemoveRootWindowEventFilter(input_method_filter_.get());
   RemoveRootWindowEventFilter(accelerator_filter_.get());
 
   // ShellTooltipManager needs a valid shell instance. We delete it before
   // deleting the shell |instance_|.
   RemoveRootWindowEventFilter(tooltip_manager_.get());
   aura::RootWindow::GetInstance()->SetProperty(
       aura::kRootWindowTooltipClientKey,
       NULL);
 
   // Make sure we delete WorkspaceController before launcher is
@@ skipping 91 matching lines @@
   } else {
     internal::ToplevelLayoutManager* toplevel_layout_manager =
         new internal::ToplevelLayoutManager();
     default_container->SetLayoutManager(toplevel_layout_manager);
     toplevel_layout_manager->set_shelf(shelf_layout_manager);
   }
 
   // Force a layout.
   root_window_layout->OnWindowResized();
 
+  // Initialize InputMethodEventFilter. This one must be added first since the
+  // filter has the highest priority.
+  input_method_filter_.reset(new internal::InputMethodEventFilter);
+  AddRootWindowEventFilter(input_method_filter_.get());
+
   // Initialize ShellAcceleratorFilter
   accelerator_filter_.reset(new internal::ShellAcceleratorFilter);
   AddRootWindowEventFilter(accelerator_filter_.get());
 
   // Initialize ShellTooltipManager
   tooltip_manager_.reset(new ShellTooltipManager);
   aura::RootWindow::GetInstance()->SetProperty(
       aura::kRootWindowTooltipClientKey,
       static_cast<aura::TooltipClient*>(tooltip_manager_.get()));
   AddRootWindowEventFilter(tooltip_manager_.get());
@@ skipping 46 matching lines @@
       new internal::WorkspaceController(default_container));
   workspace_controller_->SetLauncherModel(launcher_->model());
   default_container->SetEventFilter(
       new internal::DefaultContainerEventFilter(default_container));
   default_container->SetLayoutManager(
       new internal::DefaultContainerLayoutManager(
           workspace_controller_->workspace_manager()));
 }
 
 }  // namespace aura_shell