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

ui/aura_shell/shell.h

 // 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.
 
 #ifndef UI_AURA_SHELL_SHELL_H_
 #define UI_AURA_SHELL_SHELL_H_
 #pragma once
 
 #include <utility>
 #include <vector>
@@ skipping 18 matching lines @@
 
 class Launcher;
 class ShellAcceleratorController;
 class ShellDelegate;
 class ShellTooltipManager;
 
 namespace internal {
 class ActivationController;
 class AppList;
 class DragDropController;
+class InputMethodEventFilter;
 class ShadowController;
 class ShellAcceleratorFilter;
 class StackingController;
 class WorkspaceController;
 }
 
 // Shell is a singleton object that presents the Shell API and implements the
 // RootWindow's delegate interface.
 class AURA_SHELL_EXPORT Shell {
  public:
   // Upon creation, the Shell sets itself as the RootWindow's delegate, which
   // takes ownership of the Shell.
 
   // A shell must be explicitly created so that it can call |Init()| with the
   // delegate set. |delegate| can be NULL (if not required for initialization).
   static Shell* CreateInstance(ShellDelegate* delegate);
 
   // Should never be called before |CreateInstance()|.
   static Shell* GetInstance();
 
   static void DeleteInstance();
 
   aura::Window* GetContainer(int container_id);
   const aura::Window* GetContainer(int container_id) const;
 
   // Adds or removes |filter| from the RootWindowEventFilter.
   void AddRootWindowEventFilter(aura::EventFilter* filter);
   void RemoveRootWindowEventFilter(aura::EventFilter* filter);
+  size_t GetNumRootWindowEventFilters() const;

[Ben Goodger (Google), 2011/12/20 21:02:02]

GetRootWindowEventFilterCount()

[Yusuke Sato, 2011/12/21 16:57:27]

Done.

 
   // Toggles between overview mode and normal mode.
   void ToggleOverview();
 
   // Toggles app list.
   void ToggleAppList();
 
   // Returns true if the screen is locked.
   bool IsScreenLocked() const;
 
@@ skipping 40 matching lines @@
   scoped_ptr<Launcher> launcher_;
 
   scoped_ptr<internal::AppList> app_list_;
 
   scoped_ptr<internal::StackingController> stacking_controller_;
   scoped_ptr<internal::ActivationController> activation_controller_;
   scoped_ptr<internal::DragDropController> drag_drop_controller_;
   scoped_ptr<internal::WorkspaceController> workspace_controller_;
   scoped_ptr<internal::ShadowController> shadow_controller_;
 
+  // An event filter that pre-handles all key events to send them to an IME.
+  scoped_ptr<internal::InputMethodEventFilter> input_method_filter_;
   // An event filter that pre-handles global accelerators.
   scoped_ptr<internal::ShellAcceleratorFilter> accelerator_filter_;
 
   scoped_ptr<ShellTooltipManager> tooltip_manager_;
 
   DISALLOW_COPY_AND_ASSIGN(Shell);
 };
 
 }  // namespace aura_shell
 
 #endif  // UI_AURA_SHELL_SHELL_H_