Index: chrome/browser/renderer_host/render_widget_host_view_views.cc |
diff --git a/chrome/browser/renderer_host/render_widget_host_view_views.cc b/chrome/browser/renderer_host/render_widget_host_view_views.cc |
index b9ebf768e239fcf1454f88401e7ac4b2cc58a862..20917fc9a19be564a47bd480949c17f33f5e09d2 100644 |
--- a/chrome/browser/renderer_host/render_widget_host_view_views.cc |
+++ b/chrome/browser/renderer_host/render_widget_host_view_views.cc |
@@ -289,12 +289,16 @@ void RenderWidgetHostViewViews::SetIsLoading(bool is_loading) { |
} |
void RenderWidgetHostViewViews::ImeUpdateTextInputState( |
- WebKit::WebTextInputType type, |
+ ui::TextInputType type, |
+ ui::TextInputPreeditType preedit_type, |
const gfx::Rect& caret_rect) { |
+ // TODO(kinaba): currently, preedit_type is ignored and always treated as |
+ // ui::TEXT_INPUT_PREEDIT_TYPE_INLINE. We need to support |
+ // ui::TEXT_INPUT_PREEDIT_ON_CANDIDATE_WINDOW for supporting PPAPI plugins |
+ // that cannot draw preedit-text inline by themselves. |
DCHECK(GetInputMethod()); |
- ui::TextInputType new_type = static_cast<ui::TextInputType>(type); |
- if (text_input_type_ != new_type) { |
- text_input_type_ = new_type; |
+ if (text_input_type_ != type) { |
+ text_input_type_ = type; |
GetInputMethod()->OnTextInputTypeChanged(this); |
} |
if (caret_bounds_ != caret_rect) { |