Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(84)

Unified Diff: ui/aura_shell/shell.h

Issue 8576005: IME (input method editor) support for Aura, part 3 of 3: Use ui::InputMethod in ash. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: review fixes Created 9 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: ui/aura_shell/shell.h
diff --git a/ui/aura_shell/shell.h b/ui/aura_shell/shell.h
index 6193667a3bf4c1dd7f0de51fb1e372de0252c73d..c686ab48d0932ae7f0b6807cb15a934c90ca52b0 100644
--- a/ui/aura_shell/shell.h
+++ b/ui/aura_shell/shell.h
@@ -36,6 +36,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 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();
@@ -124,6 +126,8 @@ class AURA_SHELL_EXPORT Shell {
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_;

Powered by Google App Engine
This is Rietveld 408576698