| 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 a1f62d8516e0a9e7a0d2c94be4eec751513f937d..53683e906a6fb6ee87a6bff8e30401448885c57e 100644
|
| --- a/ui/views/widget/native_widget_aura.h
|
| +++ b/ui/views/widget/native_widget_aura.h
|
| @@ -9,6 +9,7 @@
|
| #include "base/memory/weak_ptr.h"
|
| #include "ui/aura/client/focus_change_observer.h"
|
| #include "ui/aura/window_delegate.h"
|
| +#include "ui/aura/window_observer.h"
|
| #include "ui/base/cursor/cursor.h"
|
| #include "ui/events/event_constants.h"
|
| #include "ui/views/ime/input_method_delegate.h"
|
| @@ -35,6 +36,7 @@ class VIEWS_EXPORT NativeWidgetAura
|
| : public internal::NativeWidgetPrivate,
|
| public internal::InputMethodDelegate,
|
| public aura::WindowDelegate,
|
| + public aura::WindowObserver,
|
| public aura::client::ActivationDelegate,
|
| public aura::client::ActivationChangeObserver,
|
| public aura::client::FocusChangeObserver,
|
| @@ -158,6 +160,11 @@ class VIEWS_EXPORT NativeWidgetAura
|
| virtual bool HasHitTestMask() const OVERRIDE;
|
| virtual void GetHitTestMask(gfx::Path* mask) const OVERRIDE;
|
|
|
| + // Overridden from aura::WindowObserver:
|
| + virtual void OnWindowPropertyChanged(aura::Window* window,
|
| + const void* key,
|
| + intptr_t old) OVERRIDE;
|
| +
|
| // Overridden from ui::EventHandler:
|
| virtual void OnKeyEvent(ui::KeyEvent* event) OVERRIDE;
|
| virtual void OnMouseEvent(ui::MouseEvent* event) OVERRIDE;
|
|
|