| Index: content/browser/renderer_host/render_widget_host_view_aura.cc
|
| diff --git a/content/browser/renderer_host/render_widget_host_view_aura.cc b/content/browser/renderer_host/render_widget_host_view_aura.cc
|
| index 6b03259e873c228a89b4854d4bc15c1b8e56aef7..eeb5ee3135cdb41009a8c70dbcef4b5292eb41da 100644
|
| --- a/content/browser/renderer_host/render_widget_host_view_aura.cc
|
| +++ b/content/browser/renderer_host/render_widget_host_view_aura.cc
|
| @@ -1615,10 +1615,6 @@ void RenderWidgetHostViewAura::InsertChar(base::char16 ch, int flags) {
|
| }
|
| }
|
|
|
| -gfx::NativeWindow RenderWidgetHostViewAura::GetAttachedWindow() const {
|
| - return window_;
|
| -}
|
| -
|
| ui::TextInputType RenderWidgetHostViewAura::GetTextInputType() const {
|
| return text_input_type_;
|
| }
|
| @@ -2686,8 +2682,8 @@ void RenderWidgetHostViewAura::RemovingFromRootWindow() {
|
|
|
| void RenderWidgetHostViewAura::DetachFromInputMethod() {
|
| ui::InputMethod* input_method = GetInputMethod();
|
| - if (input_method && input_method->GetTextInputClient() == this)
|
| - input_method->SetFocusedTextInputClient(NULL);
|
| + if (input_method)
|
| + input_method->DetachTextInputClient(this);
|
| }
|
|
|
| void RenderWidgetHostViewAura::ForwardKeyboardEvent(
|
|
|