Chromium Code Reviews| 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 f358b588534cb3ccd28836e150e45098e38210de..f0429d81dc6047b97198b6b357aa366aa83e110d 100644 |
| --- a/ui/views/widget/desktop_aura/desktop_native_widget_aura.h |
| +++ b/ui/views/widget/desktop_aura/desktop_native_widget_aura.h |
| @@ -28,6 +28,7 @@ class CompoundEventFilter; |
| class InputMethodEventFilter; |
| class ShadowController; |
| class TooltipController; |
| +class VisibilityController; |
| } |
| class DesktopRootWindowHost; |
| @@ -148,6 +149,7 @@ class VIEWS_EXPORT DesktopNativeWidgetAura |
| // Overridden from aura::WindowDelegate: |
| virtual gfx::Size GetMinimumSize() const OVERRIDE; |
| virtual gfx::Size GetMaximumSize() const OVERRIDE; |
| + virtual void SetHostTransitionBounds(const gfx::Rect& bounds) OVERRIDE; |
| virtual void OnBoundsChanged(const gfx::Rect& old_bounds, |
| const gfx::Rect& new_bounds) OVERRIDE; |
| virtual gfx::NativeCursor GetCursor(const gfx::Point& point) OVERRIDE; |
| @@ -159,6 +161,7 @@ class VIEWS_EXPORT DesktopNativeWidgetAura |
| virtual void OnCaptureLost() OVERRIDE; |
| virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE; |
| virtual void OnDeviceScaleFactorChanged(float device_scale_factor) OVERRIDE; |
| + virtual void OnWindowHidingAnimationCompleted() OVERRIDE; |
| virtual void OnWindowDestroying() OVERRIDE; |
| virtual void OnWindowDestroyed() OVERRIDE; |
| virtual void OnWindowTargetVisibilityChanged(bool visible) OVERRIDE; |
| @@ -228,11 +231,19 @@ class VIEWS_EXPORT DesktopNativeWidgetAura |
| scoped_ptr<corewm::TooltipController> tooltip_controller_; |
| scoped_ptr<TooltipManagerAura> tooltip_manager_; |
| + scoped_ptr<views::corewm::VisibilityController> visibility_controller_; |
| + |
| // See comments in OnLostActive(). |
| bool restore_focus_on_activate_; |
| scoped_ptr<corewm::ShadowController> shadow_controller_; |
| + // When Close()d and animations are being applied to this window, the close |
| + // of the host window needs to be deferred to when the close animation is |
| + // completed. This variable indicates that a Close was converted to a Hide, |
| + // so that when the Hide is completed the host window should be closed. |
| + bool pending_close_; |
|
sky
2013/03/15 03:15:05
This worries me. It results in delaying close quit
scottmg
2013/03/15 22:23:46
Yeah, I'm a bit concerned too. I can't see any cle
|
| + |
| DISALLOW_COPY_AND_ASSIGN(DesktopNativeWidgetAura); |
| }; |