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

Unified Diff: ui/aura/root_window.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: moving IME code to aura_shell. not ready for review 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
« no previous file with comments | « ui/aura/event.cc ('k') | ui/aura/root_window.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/aura/root_window.h
diff --git a/ui/aura/root_window.h b/ui/aura/root_window.h
index ddefbe709222e4aa420a6d610959604067010447..a95d817751090f14519ac4569162c60e93e8adec 100644
--- a/ui/aura/root_window.h
+++ b/ui/aura/root_window.h
@@ -26,6 +26,7 @@ class Size;
}
namespace ui {
+class InputMethod;
class LayerAnimationSequence;
class Transform;
}
@@ -61,6 +62,10 @@ class AURA_EXPORT RootWindow : public ui::CompositorDelegate,
Window* mouse_pressed_handler() { return mouse_pressed_handler_; }
Window* capture_window() { return capture_window_; }
ScreenAura* screen() { return screen_; }
+ void set_input_method(ui::InputMethod* input_method) {
+ input_method_ = input_method; // does not own |input_method|.
+ }
+ ui::InputMethod* input_method() const { return input_method_; }
void SetStackingClient(StackingClient* stacking_client);
@@ -236,6 +241,8 @@ class AURA_EXPORT RootWindow : public ui::CompositorDelegate,
Window* focused_window_;
Window* touch_event_handler_;
+ ui::InputMethod* input_method_;
+
DISALLOW_COPY_AND_ASSIGN(RootWindow);
};
« no previous file with comments | « ui/aura/event.cc ('k') | ui/aura/root_window.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698