| Index: ui/views/widget/desktop_aura/desktop_native_widget_aura.h
|
| diff --git a/ui/views/widget/desktop_aura/desktop_native_widget_aura.h b/ui/views/widget/desktop_aura/desktop_native_widget_aura.h
|
| index 8735ac0773dac909c48476c97f4a69cf19c6effa..22bf3dac8bbec3bfbdd432a9d9eafa4a20acc848 100644
|
| --- a/ui/views/widget/desktop_aura/desktop_native_widget_aura.h
|
| +++ b/ui/views/widget/desktop_aura/desktop_native_widget_aura.h
|
| @@ -121,6 +121,7 @@ class VIEWS_EXPORT DesktopNativeWidgetAura
|
| virtual bool HasCapture() const OVERRIDE;
|
| virtual InputMethod* CreateInputMethod() OVERRIDE;
|
| virtual internal::InputMethodDelegate* GetInputMethodDelegate() OVERRIDE;
|
| + virtual ui::InputMethod* GetHostInputMethod() OVERRIDE;
|
| virtual void CenterWindow(const gfx::Size& size) OVERRIDE;
|
| virtual void GetWindowPlacement(
|
| gfx::Rect* bounds,
|
| @@ -295,7 +296,6 @@ class VIEWS_EXPORT DesktopNativeWidgetAura
|
| scoped_ptr<wm::WindowModalityController>
|
| window_modality_controller_;
|
|
|
| - // See comments in OnLostActive().
|
| bool restore_focus_on_activate_;
|
|
|
| gfx::NativeCursor cursor_;
|
|
|