summaryrefslogtreecommitdiffstats
path: root/ui/views/widget/native_widget_aura.h
diff options
context:
space:
mode:
Diffstat (limited to 'ui/views/widget/native_widget_aura.h')
-rw-r--r--ui/views/widget/native_widget_aura.h5
1 files changed, 4 insertions, 1 deletions
diff --git a/ui/views/widget/native_widget_aura.h b/ui/views/widget/native_widget_aura.h
index 57dbe27..f4c177f 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.