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

Unified Diff: ui/aura/desktop.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: aura_win fix Created 9 years, 1 month 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/desktop.cc
diff --git a/ui/aura/desktop.cc b/ui/aura/desktop.cc
index 056490b75c3037e8790f309bda95c6aec26edb61..d3e474c7d1a8ab3f14d7a54ec9458f96749b95a9 100644
--- a/ui/aura/desktop.cc
+++ b/ui/aura/desktop.cc
@@ -24,6 +24,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"
@@ -586,4 +587,8 @@ gfx::Rect Desktop::GetInitialHostWindowBounds() const {
return bounds;
}
+ui::InputMethod* Desktop::GetInputMethod() {
+ return host_->GetInputMethod();
+}
+
} // namespace aura

Powered by Google App Engine
This is Rietveld 408576698