| Index: ui/aura/desktop_host_win.cc
|
| diff --git a/ui/aura/desktop_host_win.cc b/ui/aura/desktop_host_win.cc
|
| index 3ad4f66d76253c298371942004e0094e6eecbd55..523effa1c08ec664d37b7fc01d09c41bc64cf3cb 100644
|
| --- a/ui/aura/desktop_host_win.cc
|
| +++ b/ui/aura/desktop_host_win.cc
|
| @@ -114,11 +114,13 @@ gfx::Size DesktopHost::GetNativeDisplaySize() {
|
|
|
| DesktopHostWin::DesktopHostWin(const gfx::Rect& bounds)
|
| : desktop_(NULL),
|
| + ALLOW_THIS_IN_INITIALIZER_LIST(input_method_(this)),
|
| fullscreen_(false),
|
| saved_window_style_(0),
|
| saved_window_ex_style_(0) {
|
| Init(NULL, bounds);
|
| SetWindowText(hwnd(), L"aura::Desktop!");
|
| + input_method_.Init(hwnd());
|
| }
|
|
|
| DesktopHostWin::~DesktopHostWin() {
|
| @@ -245,6 +247,7 @@ void DesktopHostWin::OnClose() {
|
| LRESULT DesktopHostWin::OnKeyEvent(UINT message,
|
| WPARAM w_param,
|
| LPARAM l_param) {
|
| + // TODO(yusukes): Support input method.
|
| MSG msg = { hwnd(), message, w_param, l_param };
|
| KeyEvent keyev(msg, message == WM_CHAR);
|
| SetMsgHandled(desktop_->DispatchKeyEvent(&keyev));
|
| @@ -276,4 +279,19 @@ void DesktopHostWin::OnSize(UINT param, const CSize& size) {
|
| desktop_->OnHostResized(gfx::Size(size.cx, size.cy));
|
| }
|
|
|
| +ui::InputMethod* DesktopHostWin::GetInputMethod() {
|
| + return &input_method_;
|
| +}
|
| +
|
| +void DesktopHostWin::DispatchKeyEventPostIME(const base::NativeEvent& event) {
|
| + // TODO(yusukes): Support input method.
|
| + NOTIMPLEMENTED();
|
| +}
|
| +
|
| +void DesktopHostWin::DispatchFabricatedKeyEventPostIME(
|
| + ui::EventType type, ui::KeyboardCode key_code, int flags) {
|
| + // TODO(yusukes): Support input method.
|
| + NOTIMPLEMENTED();
|
| +}
|
| +
|
| } // namespace aura
|
|
|