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

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: rebase, review 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 58eaec2eb326301adba392be383f7eb24071b472..ec0e4b8847f60ba1dcbf33159f678b71f59519a5 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_animation_sequence.h"
@@ -587,6 +588,7 @@ bool Desktop::IsFocusedWindow(const Window* window) const {
void Desktop::Init() {
Window::Init(ui::Layer::LAYER_HAS_NO_TEXTURE);
+ GetInputMethod()->Init();
SetBounds(gfx::Rect(host_->GetSize()));
Show();
compositor()->SetRootLayer(layer());
@@ -612,4 +614,8 @@ gfx::Rect Desktop::GetInitialHostWindowBounds() const {
return bounds;
}
+ui::InputMethod* Desktop::GetInputMethod() {
+ return host_->GetInputMethod();
+}
+
} // namespace aura
« no previous file with comments | « ui/aura/desktop.h ('k') | ui/aura/desktop_host.h » ('j') | ui/base/ime/input_method.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698