Index: chrome/browser/renderer_host/render_widget_host_view_win.cc |
diff --git a/chrome/browser/renderer_host/render_widget_host_view_win.cc b/chrome/browser/renderer_host/render_widget_host_view_win.cc |
index cbc97f6bcf633a68002c19e0a5843063b7af1ed8..5ec578552c4cdf7ea7303c9ba027599a68df9acd 100644 |
--- a/chrome/browser/renderer_host/render_widget_host_view_win.cc |
+++ b/chrome/browser/renderer_host/render_widget_host_view_win.cc |
@@ -237,7 +237,7 @@ RenderWidgetHostViewWin::RenderWidgetHostViewWin(RenderWidgetHost* widget) |
parent_hwnd_(NULL), |
is_loading_(false), |
overlay_color_(0), |
- text_input_type_(WebKit::WebTextInputTypeNone) { |
+ text_input_type_(ui::TEXT_INPUT_TYPE_NONE) { |
render_widget_host_->set_view(this); |
registrar_.Add(this, |
NotificationType::RENDERER_PROCESS_TERMINATED, |
@@ -587,18 +587,23 @@ void RenderWidgetHostViewWin::SetIsLoading(bool is_loading) { |
} |
void RenderWidgetHostViewWin::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. |
if (text_input_type_ != type) { |
text_input_type_ = type; |
- if (type == WebKit::WebTextInputTypeText) |
+ if (type == ui::TEXT_INPUT_TYPE_TEXT) |
ime_input_.EnableIME(m_hWnd); |
else |
ime_input_.DisableIME(m_hWnd); |
} |
// Only update caret position if the input method is enabled. |
- if (type == WebKit::WebTextInputTypeText) |
+ if (type == ui::TEXT_INPUT_TYPE_TEXT) |
ime_input_.UpdateCaretRect(m_hWnd, caret_rect); |
} |