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

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: addressed comments 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 9309d2bf9ff26f0e1f93d4a5cc27045110b2bbe5..71f5eed29f446fbc2c8a36110436a0f358419422 100644
--- a/ui/aura/desktop_host_win.h
+++ b/ui/aura/desktop_host_win.h
@@ -8,11 +8,15 @@
#include "base/compiler_specific.h"
#include "ui/aura/desktop_host.h"
+#include "ui/base/ime/input_method_delegate.h"
+#include "ui/base/ime/mock_input_method.h"
#include "ui/base/win/window_impl.h"
namespace aura {
-class DesktopHostWin : public DesktopHost, public ui::WindowImpl {
+class DesktopHostWin : public DesktopHost,
+ public ui::internal::InputMethodDelegate,
+ public ui::WindowImpl {
public:
explicit DesktopHostWin(const gfx::Rect& bounds);
virtual ~DesktopHostWin();
@@ -30,6 +34,12 @@ class DesktopHostWin : public DesktopHost, public ui::WindowImpl {
virtual void SetCursor(gfx::NativeCursor cursor) OVERRIDE;
virtual gfx::Point QueryMouseLocation() OVERRIDE;
virtual void PostNativeEvent(const base::NativeEvent& native_event) OVERRIDE;
+ virtual ui::InputMethod* GetInputMethod() 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)
@@ -59,6 +69,9 @@ class DesktopHostWin : public DesktopHost, public ui::WindowImpl {
Desktop* desktop_;
+ // TODO(yusukes): implement ui::InputMethodWin.
+ ui::MockInputMethod input_method_;
+
bool fullscreen_;
RECT saved_window_rect_;
DWORD saved_window_style_;

Powered by Google App Engine
This is Rietveld 408576698