Index: content/renderer/render_view.cc |
diff --git a/content/renderer/render_view.cc b/content/renderer/render_view.cc |
index 0d1e8e06135343697d8d0c522435b7a83ab9063f..cb37e1db180fd3f9f88c52a3de093d38339169a6 100644 |
--- a/content/renderer/render_view.cc |
+++ b/content/renderer/render_view.cc |
@@ -3977,14 +3977,22 @@ void RenderView::OnImeConfirmComposition(const string16& text) { |
} |
} |
-WebKit::WebTextInputType RenderView::GetTextInputType() { |
+ui::TextInputType RenderView::GetTextInputType() { |
if (pepper_delegate_.IsPluginFocused()) { |
// TODO(kinaba) Until PPAPI has an interface for handling IME events, we |
// consider all the parts of PPAPI plugins are accepting text inputs. |
- return WebKit::WebTextInputTypeText; |
- } else { |
- return RenderWidget::GetTextInputType(); |
+ return ui::TEXT_INPUT_TYPE_TEXT; |
} |
+ return RenderWidget::GetTextInputType(); |
+} |
+ |
+bool RenderView::CanComposeInline() { |
+ if (pepper_delegate_.IsPluginFocused()) { |
+ // TODO(kinaba) Until PPAPI has an interface for handling IME events, we |
+ // consider all the parts of PPAPI plugins are accepting text inputs. |
brettw
2011/06/16 17:39:43
I don't quite follow this comment. To me, consider
kochi
2011/06/17 03:47:21
Maybe like this:
Until PPAPI has an interface for
kinaba
2011/06/17 04:12:25
Done.
|
+ return false; |
+ } |
+ return true; |
} |
#if defined(OS_MACOSX) |