Index: ash/wm/window_state.h |
diff --git a/ash/wm/window_state.h b/ash/wm/window_state.h |
index 653071fea794991d379e25eb452e5a8f82293d80..5e069bcf6eb3e4e645100e8a7ab4eba9844cef01 100644 |
--- a/ash/wm/window_state.h |
+++ b/ash/wm/window_state.h |
@@ -25,6 +25,7 @@ namespace ash { |
class WindowResizer; |
namespace wm { |
+class WindowStateDelegate; |
class WindowStateObserver; |
// WindowState manages and defines ash specific window state and |
@@ -48,6 +49,8 @@ class ASH_EXPORT WindowState : public aura::WindowObserver { |
aura::Window* window() { return window_; } |
const aura::Window* window() const { return window_; } |
+ void SetDelegate(scoped_ptr<WindowStateDelegate> delegate); |
+ |
// Returns the window's current show state. |
ui::WindowShowState GetShowState() const; |
@@ -83,6 +86,7 @@ class ASH_EXPORT WindowState : public aura::WindowObserver { |
void Deactivate(); |
void Restore(); |
void ToggleMaximized(); |
+ void ToggleFullscreen(); |
void SnapLeft(const gfx::Rect& bounds); |
void SnapRight(const gfx::Rect& bounds); |
@@ -134,6 +138,15 @@ class ASH_EXPORT WindowState : public aura::WindowObserver { |
hide_shelf_when_fullscreen_ = value; |
} |
+ // Sets/gets the flag to suppress the cross-fade animation for |
+ // the transition to the fullscreen state. |
+ bool animate_to_fullscreen() const { |
+ return animate_to_fullscreen_; |
+ } |
+ void set_animate_to_fullscreen(bool value) { |
+ animate_to_fullscreen_ = value; |
+ } |
+ |
// Gets/Sets the bounds of the window before it was moved by the auto window |
// management. As long as it was not auto-managed, it will return NULL. |
const gfx::Rect* pre_auto_manage_window_bounds() const { |
@@ -233,6 +246,7 @@ class ASH_EXPORT WindowState : public aura::WindowObserver { |
// The owner of this window settings. |
aura::Window* window_; |
+ scoped_ptr<WindowStateDelegate> delegate_; |
bool tracked_by_workspace_; |
bool window_position_managed_; |
@@ -246,6 +260,7 @@ class ASH_EXPORT WindowState : public aura::WindowObserver { |
bool always_restores_to_restore_bounds_; |
bool hide_shelf_when_fullscreen_; |
+ bool animate_to_fullscreen_; |
// A property to remember the window position which was set before the |
// auto window position manager changed the window bounds, so that it can get |