Chromium Code Reviews| Index: content/renderer/render_view.cc |
| diff --git a/content/renderer/render_view.cc b/content/renderer/render_view.cc |
| index 0d1e8e06135343697d8d0c522435b7a83ab9063f..408a66cdf7018d7cb0abf255453ee3ee86f6e3f4 100644 |
| --- a/content/renderer/render_view.cc |
| +++ b/content/renderer/render_view.cc |
| @@ -3977,16 +3977,26 @@ 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; |
| + return ui::TEXT_INPUT_TYPE_TEXT; |
| } else { |
| 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. |
| + return false; |
| + } else { |
|
brettw
2011/06/13 14:52:36
Normally we prefer no "else" after a return statem
kinaba
2011/06/13 17:48:16
Done.
|
| + return true; |
| + } |
| +} |
| + |
| #if defined(OS_MACOSX) |
| void RenderView::PluginFocusChanged(bool focused, int plugin_id) { |
| IPC::Message* msg = new ViewHostMsg_PluginFocusChanged(routing_id(), |