Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1111)

Unified Diff: ui/views/widget/desktop_aura/desktop_native_widget_aura.h

Issue 12342028: make menus, bubbles, etc. top level windows on aura (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: add animation_host.* Created 7 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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..01391fb9b7760721633c1ceb9108cc29c97a64f6 100644
--- a/ui/views/widget/desktop_aura/desktop_native_widget_aura.h
+++ b/ui/views/widget/desktop_aura/desktop_native_widget_aura.h
@@ -8,6 +8,7 @@
#include "base/memory/weak_ptr.h"
#include "ui/aura/client/activation_change_observer.h"
#include "ui/aura/client/activation_delegate.h"
+#include "ui/aura/client/animation_host.h"
#include "ui/aura/client/drag_drop_delegate.h"
#include "ui/aura/client/focus_change_observer.h"
#include "ui/aura/window_delegate.h"
@@ -28,6 +29,7 @@ class CompoundEventFilter;
class InputMethodEventFilter;
class ShadowController;
class TooltipController;
+class VisibilityController;
}
class DesktopRootWindowHost;
@@ -42,6 +44,7 @@ class VIEWS_EXPORT DesktopNativeWidgetAura
public aura::client::ActivationDelegate,
public aura::client::ActivationChangeObserver,
public aura::client::FocusChangeObserver,
+ public aura::client::AnimationHost,
public views::internal::InputMethodDelegate,
public aura::client::DragDropDelegate {
public:
@@ -166,6 +169,10 @@ class VIEWS_EXPORT DesktopNativeWidgetAura
virtual void GetHitTestMask(gfx::Path* mask) const OVERRIDE;
virtual scoped_refptr<ui::Texture> CopyTexture() OVERRIDE;
+ // Overridden from aura::WindowAnimationHost
+ virtual void SetHostTransitionBounds(const gfx::Rect& bounds) OVERRIDE;
+ virtual void OnWindowHidingAnimationCompleted() OVERRIDE;
+
// Overridden from ui::EventHandler:
virtual void OnKeyEvent(ui::KeyEvent* event) OVERRIDE;
virtual void OnMouseEvent(ui::MouseEvent* event) OVERRIDE;
@@ -228,11 +235,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_;
+
DISALLOW_COPY_AND_ASSIGN(DesktopNativeWidgetAura);
};

Powered by Google App Engine
This is Rietveld 408576698