| Index: ui/aura_shell/shell.h
|
| diff --git a/ui/aura_shell/shell.h b/ui/aura_shell/shell.h
|
| index 66c88eb62054e816db12b01ec57914263e041aa4..634dbaa7b03e6a62936769554311a61293b4c190 100644
|
| --- a/ui/aura_shell/shell.h
|
| +++ b/ui/aura_shell/shell.h
|
| @@ -35,6 +35,7 @@ namespace internal {
|
| class ActivationController;
|
| class AppList;
|
| class DragDropController;
|
| +class InputMethodEventFilter;
|
| class ShadowController;
|
| class ShellAcceleratorFilter;
|
| class StackingController;
|
| @@ -64,6 +65,7 @@ class AURA_SHELL_EXPORT Shell {
|
| // Adds or removes |filter| from the RootWindowEventFilter.
|
| void AddRootWindowEventFilter(aura::EventFilter* filter);
|
| void RemoveRootWindowEventFilter(aura::EventFilter* filter);
|
| + size_t GetRootWindowEventFilterCount() const;
|
|
|
| // Toggles between overview mode and normal mode.
|
| void ToggleOverview();
|
| @@ -125,6 +127,8 @@ class AURA_SHELL_EXPORT Shell {
|
| scoped_ptr<internal::ShadowController> shadow_controller_;
|
| scoped_ptr<internal::TooltipController> tooltip_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_;
|
|
|
|
|