diff options
| author | penghuang <penghuang@chromium.org> | 2015-07-27 10:28:53 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-07-27 17:30:07 +0000 |
| commit | 3c35f9535d0aa9066738b643c34e2aa7b833265b (patch) | |
| tree | 1be0c4e0bd7b0429518a1da7c8bda8a299e05a41 /ui/platform_window/x11 | |
| parent | bda290c881e5375992844e29f25cbea8408aa027 (diff) | |
| download | chromium_src-3c35f9535d0aa9066738b643c34e2aa7b833265b.zip chromium_src-3c35f9535d0aa9066738b643c34e2aa7b833265b.tar.gz chromium_src-3c35f9535d0aa9066738b643c34e2aa7b833265b.tar.bz2 | |
Mandoline: Support text input on Android part 1 of 2.
This CL is a part of CL https://codereview.chromium.org/1209083004/ .
It Adds the PlatformImeController in PlatformWindow. It will be used for
conmunicating with OS IME system. It also addes the a PlatformImeController
implementation for Android.
BUG=498624
Review URL: https://codereview.chromium.org/1252563004
Cr-Commit-Position: refs/heads/master@{#340494}
Diffstat (limited to 'ui/platform_window/x11')
| -rw-r--r-- | ui/platform_window/x11/x11_window.cc | 4 | ||||
| -rw-r--r-- | ui/platform_window/x11/x11_window.h | 1 |
2 files changed, 5 insertions, 0 deletions
diff --git a/ui/platform_window/x11/x11_window.cc b/ui/platform_window/x11/x11_window.cc index 747581700..1e94ae2 100644 --- a/ui/platform_window/x11/x11_window.cc +++ b/ui/platform_window/x11/x11_window.cc @@ -260,6 +260,10 @@ void X11Window::MoveCursorTo(const gfx::Point& location) {} void X11Window::ConfineCursorToBounds(const gfx::Rect& bounds) { } +PlatformImeController* X11Window::GetPlatformImeController() { + return nullptr; +} + bool X11Window::CanDispatchEvent(const PlatformEvent& event) { return FindXEventTarget(event) == xwindow_; } diff --git a/ui/platform_window/x11/x11_window.h b/ui/platform_window/x11/x11_window.h index 0b6b9cb..6d422c7 100644 --- a/ui/platform_window/x11/x11_window.h +++ b/ui/platform_window/x11/x11_window.h @@ -43,6 +43,7 @@ class X11_WINDOW_EXPORT X11Window : public PlatformWindow, void SetCursor(PlatformCursor cursor) override; void MoveCursorTo(const gfx::Point& location) override; void ConfineCursorToBounds(const gfx::Rect& bounds) override; + PlatformImeController* GetPlatformImeController() override; // PlatformEventDispatcher: bool CanDispatchEvent(const PlatformEvent& event) override; |