| Index: chrome/browser/renderer_host/render_widget_host_view_win.h
|
| diff --git a/chrome/browser/renderer_host/render_widget_host_view_win.h b/chrome/browser/renderer_host/render_widget_host_view_win.h
|
| index ce210edf4c489a568bfacfedcd508c6a7d5bf1d9..dc6ec57bedd40e952d34e620a25e14355c9fa5fa 100644
|
| --- a/chrome/browser/renderer_host/render_widget_host_view_win.h
|
| +++ b/chrome/browser/renderer_host/render_widget_host_view_win.h
|
| @@ -146,7 +146,8 @@ class RenderWidgetHostViewWin
|
| virtual gfx::Rect GetViewBounds() const OVERRIDE;
|
| virtual void UpdateCursor(const WebCursor& cursor) OVERRIDE;
|
| virtual void SetIsLoading(bool is_loading) OVERRIDE;
|
| - virtual void ImeUpdateTextInputState(WebKit::WebTextInputType type,
|
| + virtual void ImeUpdateTextInputState(ui::TextInputType type,
|
| + bool can_compose_inline,
|
| const gfx::Rect& caret_rect) OVERRIDE;
|
| virtual void ImeCancelComposition() OVERRIDE;
|
| virtual void DidUpdateBackingStore(
|
| @@ -360,7 +361,7 @@ class RenderWidgetHostViewWin
|
|
|
| // Stores the current text input type received by ImeUpdateTextInputState()
|
| // method.
|
| - WebKit::WebTextInputType text_input_type_;
|
| + ui::TextInputType text_input_type_;
|
|
|
| ScopedVector<ui::ViewProp> props_;
|
|
|
|
|