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

Unified Diff: ui/aura/desktop_host_win.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: git mv desktop_host_unittest.cc desktop_host_ime_unittest.cc 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_host_win.h
diff --git a/ui/aura/desktop_host_win.h b/ui/aura/desktop_host_win.h
index cd9c1361c84810beabd828483c691c64a0f62235..f6acdfb9e5fedce6949f72e51528ec520a1d7b88 100644
--- a/ui/aura/desktop_host_win.h
+++ b/ui/aura/desktop_host_win.h
@@ -7,12 +7,18 @@
#pragma once
#include "base/compiler_specific.h"
+#include "base/memory/scoped_ptr.h"
#include "ui/aura/desktop_host.h"
#include "ui/base/win/window_impl.h"
+namespace ui {
+class InputMethod;
+} // namespace ui
+
namespace aura {
-class DesktopHostWin : public DesktopHost, public ui::WindowImpl {
+class DesktopHostWin : public DesktopHost,
+ public ui::WindowImpl {
public:
explicit DesktopHostWin(const gfx::Rect& bounds);
virtual ~DesktopHostWin();
@@ -32,6 +38,14 @@ class DesktopHostWin : public DesktopHost, public ui::WindowImpl {
virtual gfx::Point QueryMouseLocation() OVERRIDE;
virtual void PostNativeEvent(const base::NativeEvent& native_event) OVERRIDE;
+ virtual void SetInputMethod(ui::InputMethod* input_method) OVERRIDE;
+ virtual ui::InputMethod* GetInputMethod() const OVERRIDE;
+
+ // ui::internal::InputMethodDelegate Override.
+ virtual void DispatchKeyEventPostIME(const base::NativeEvent& event) OVERRIDE;
+ virtual void DispatchFabricatedKeyEventPostIME(
+ ui::EventType type, ui::KeyboardCode key_code, int flags) OVERRIDE;
+
private:
BEGIN_MSG_MAP_EX(DesktopHostWin)
// Range handlers must go first!
@@ -60,6 +74,8 @@ class DesktopHostWin : public DesktopHost, public ui::WindowImpl {
Desktop* desktop_;
+ scoped_ptr<ui::InputMethod> input_method_;
+
bool fullscreen_;
RECT saved_window_rect_;
DWORD saved_window_style_;

Powered by Google App Engine
This is Rietveld 408576698