| Index: ui/views/widget/native_widget_aura.h
|
| diff --git a/ui/views/widget/native_widget_aura.h b/ui/views/widget/native_widget_aura.h
|
| index 57dbe271882576986efd838f07cd5aea17837d6c..f4c177f08a41ea64bab6c125bf2de7447080a3f6 100644
|
| --- a/ui/views/widget/native_widget_aura.h
|
| +++ b/ui/views/widget/native_widget_aura.h
|
| @@ -131,7 +131,7 @@ class VIEWS_EXPORT NativeWidgetAura : public internal::NativeWidgetPrivate,
|
| virtual gfx::Size GetMinimumSize() const OVERRIDE;
|
| virtual void OnBoundsChanged(const gfx::Rect& old_bounds,
|
| const gfx::Rect& new_bounds) OVERRIDE;
|
| - virtual void OnFocus() OVERRIDE;
|
| + virtual void OnFocus(aura::Window* old_focused_window) OVERRIDE;
|
| virtual void OnBlur() OVERRIDE;
|
| virtual bool OnKeyEvent(aura::KeyEvent* event) OVERRIDE;
|
| virtual gfx::NativeCursor GetCursor(const gfx::Point& point) OVERRIDE;
|
| @@ -189,6 +189,9 @@ class VIEWS_EXPORT NativeWidgetAura : public internal::NativeWidgetPrivate,
|
| // Can we be made active?
|
| bool can_activate_;
|
|
|
| + // Are we in the destructor?
|
| + bool destroying_;
|
| +
|
| gfx::NativeCursor cursor_;
|
|
|
| // The saved window state for exiting full screen state.
|
|
|