| 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_;
|
|
|