From 7f81cc7f06760f99b6c125b6fd72abdb04ccc73d Mon Sep 17 00:00:00 2001 From: "penghuang@chromium.org" Date: Wed, 7 Sep 2011 18:19:31 +0000 Subject: Disable keyboard input in flash for touch ui BUG=None TEST=cros device Review URL: http://codereview.chromium.org/7800044 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@99976 0039d316-1c4b-4281-b951-d872f2087c98 --- content/renderer/render_view.cc | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'content') diff --git a/content/renderer/render_view.cc b/content/renderer/render_view.cc index 1e8c4c6..de09b3e 100644 --- a/content/renderer/render_view.cc +++ b/content/renderer/render_view.cc @@ -4281,9 +4281,15 @@ void RenderView::OnImeConfirmComposition(const string16& text) { ui::TextInputType RenderView::GetTextInputType() { if (pepper_delegate_.IsPluginFocused()) { +#if !defined(TOUCH_UI) // TODO(kinaba) Until PPAPI has an interface for handling IME events, we // consider all the parts of PPAPI plugins are accepting text inputs. return ui::TEXT_INPUT_TYPE_TEXT; +#else + // Disable keyboard input in flash for touch ui until PPAPI can support IME + // events. + return ui::TEXT_INPUT_TYPE_NONE; +#endif } return RenderWidget::GetTextInputType(); } -- cgit v1.1