Chromium Code Reviews| Index: ash/wm/window_state.h |
| diff --git a/ash/wm/window_state.h b/ash/wm/window_state.h |
| index 653071fea794991d379e25eb452e5a8f82293d80..213c7f2055ec656be5c1f92161f1f41d5ec4644c 100644 |
| --- a/ash/wm/window_state.h |
| +++ b/ash/wm/window_state.h |
| @@ -6,6 +6,7 @@ |
| #define ASH_WM_WINDOW_STATE_H_ |
| #include "ash/ash_export.h" |
| +#include "ash/wm/window_state_delegate.h" |
|
James Cook
2013/10/29 16:13:04
nit: Do you need this include? It doesn't look li
oshima
2013/10/29 17:45:54
Done.
|
| #include "ash/wm/wm_types.h" |
| #include "base/basictypes.h" |
| #include "base/memory/scoped_ptr.h" |
| @@ -25,6 +26,7 @@ namespace ash { |
| class WindowResizer; |
| namespace wm { |
| +class WindowStateDelegate; |
| class WindowStateObserver; |
| // WindowState manages and defines ash specific window state and |
| @@ -48,6 +50,8 @@ class ASH_EXPORT WindowState : public aura::WindowObserver { |
| aura::Window* window() { return window_; } |
| const aura::Window* window() const { return window_; } |
| + void SetDelegate(WindowStateDelegate* delegate); |
| + |
| // Returns the window's current show state. |
| ui::WindowShowState GetShowState() const; |
| @@ -83,6 +87,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 +139,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 +247,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 +261,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 |