summaryrefslogtreecommitdiffstats
path: root/ui/platform_window/win
diff options
context:
space:
mode:
authorpenghuang <penghuang@chromium.org>2015-07-27 10:28:53 -0700
committerCommit bot <commit-bot@chromium.org>2015-07-27 17:30:07 +0000
commit3c35f9535d0aa9066738b643c34e2aa7b833265b (patch)
tree1be0c4e0bd7b0429518a1da7c8bda8a299e05a41 /ui/platform_window/win
parentbda290c881e5375992844e29f25cbea8408aa027 (diff)
downloadchromium_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/win')
-rw-r--r--ui/platform_window/win/win_window.cc4
-rw-r--r--ui/platform_window/win/win_window.h1
2 files changed, 5 insertions, 0 deletions
diff --git a/ui/platform_window/win/win_window.cc b/ui/platform_window/win/win_window.cc
index c2554d4..fd65bba 100644
--- a/ui/platform_window/win/win_window.cc
+++ b/ui/platform_window/win/win_window.cc
@@ -109,6 +109,10 @@ void WinWindow::MoveCursorTo(const gfx::Point& location) {}
void WinWindow::ConfineCursorToBounds(const gfx::Rect& bounds) {
}
+PlatformImeController* WinWindow::GetPlatformImeController() {
+ return nullptr;
+}
+
LRESULT WinWindow::OnMouseRange(UINT message, WPARAM w_param, LPARAM l_param) {
// TODO(vadimt): Remove ScopedTracker below once crbug.com/440919 is fixed.
tracked_objects::ScopedTracker tracking_profile(
diff --git a/ui/platform_window/win/win_window.h b/ui/platform_window/win/win_window.h
index 8fb8adc..eb02ca9 100644
--- a/ui/platform_window/win/win_window.h
+++ b/ui/platform_window/win/win_window.h
@@ -36,6 +36,7 @@ class WIN_WINDOW_EXPORT WinWindow : public NON_EXPORTED_BASE(PlatformWindow),
void SetCursor(PlatformCursor cursor) override;
void MoveCursorTo(const gfx::Point& location) override;
void ConfineCursorToBounds(const gfx::Rect& bounds) override;
+ PlatformImeController* GetPlatformImeController() override;
CR_BEGIN_MSG_MAP_EX(WinWindow)
CR_MESSAGE_RANGE_HANDLER_EX(WM_MOUSEFIRST, WM_MOUSELAST, OnMouseRange)