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

Unified Diff: ui/aura/root_window.cc

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: moved IME code to aura_shell, not ready for review though 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/root_window.cc
diff --git a/ui/aura/root_window.cc b/ui/aura/root_window.cc
index c0eb9b8f8164879cac5f071f21f04fd68c1c7a91..34c9477c15f31c4cccbc7f7e97c4c0f1c41334c0 100644
--- a/ui/aura/root_window.cc
+++ b/ui/aura/root_window.cc
@@ -27,6 +27,7 @@
#include "ui/aura/window.h"
#include "ui/aura/window_delegate.h"
#include "ui/base/hit_test.h"
+#include "ui/base/ime/input_method.h"
#include "ui/gfx/compositor/compositor.h"
#include "ui/gfx/compositor/layer.h"
#include "ui/gfx/compositor/layer_animator.h"
@@ -123,6 +124,14 @@ void RootWindow::DeleteInstance() {
instance_ = NULL;
}
+void RootWindow::SetInputMethod(ui::InputMethod* input_method) {
+ input_method_.reset(input_method);
+}
+
+ui::InputMethod* RootWindow::GetInputMethod() const {
+ return input_method_.get();
+}
+
void RootWindow::SetStackingClient(StackingClient* stacking_client) {
stacking_client_.reset(stacking_client);
}

Powered by Google App Engine
This is Rietveld 408576698