Introduce WindowStateDelegate::ToggleFullscreen

ash/wm/window_state.h

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef ASH_WM_WINDOW_STATE_H_
 #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 like it, but if you need it you
probably don't need the forward declaration below.

[oshima, 2013/10/29 17:45:54]

Done.

 #include "ash/wm/wm_types.h"
 #include "base/basictypes.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/observer_list.h"
 #include "ui/aura/window_observer.h"
 #include "ui/base/ui_base_types.h"
 
 namespace aura {
 class Window;
 }
 
 namespace gfx {
 class Rect;
 }
 
 namespace ash {
 class WindowResizer;
 
 namespace wm {
+class WindowStateDelegate;
 class WindowStateObserver;
 
 // WindowState manages and defines ash specific window state and
 // behavior. Ash specific per-window state (such as ones that controls
 // window manager behavior) and ash specific window behavior (such as
 // maximize, minimize, snap sizing etc) should be added here instead
 // of defining separate functions (like |MaximizeWindow(aura::Window*
 // window)|) or using aura Window property.
 // The WindowState gets created when first accessed by
 // |wm::GetWindowState|, and deleted when the window is deleted.
 // Prefer using this class instead of passing aura::Window* around in
 // ash code as this is often what you need to interact with, and
 // accessing the window using |window()| is cheap.
 class ASH_EXPORT WindowState : public aura::WindowObserver {
  public:
   static bool IsMaximizedOrFullscreenState(ui::WindowShowState state);
 
   explicit WindowState(aura::Window* window);
   virtual ~WindowState();
 
   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;
 
   // Returns the window's current ash show type.
   // Refer to WindowShowType definition in wm_types.h as for why Ash
   // has its own show type.
   WindowShowType window_show_type() const { return window_show_type_; }
 
   // Predicates to check window state.
   bool IsMinimized() const;
@@ skipping 15 matching lines @@
   // Returns true if the window has restore bounds.
   bool HasRestoreBounds() const;
 
   void Maximize();
   void Minimize();
   void Unminimize();
   void Activate();
   void Deactivate();
   void Restore();
   void ToggleMaximized();
+  void ToggleFullscreen();
   void SnapLeft(const gfx::Rect& bounds);
   void SnapRight(const gfx::Rect& bounds);
 
   // Sets the window's bounds in screen coordinates.
   void SetBoundsInScreen(const gfx::Rect& bounds_in_screen);
 
   // Saves the current bounds to be used as a restore bounds.
   void SaveCurrentBoundsForRestore();
 
   // Same as |GetRestoreBoundsInScreen| except that it returns the
@@ skipping 31 matching lines @@
   // Gets/sets whether the shelf should be hidden when this window is
   // fullscreen.
   bool hide_shelf_when_fullscreen() const {
     return hide_shelf_when_fullscreen_;
   }
 
   void set_hide_shelf_when_fullscreen(bool value) {
     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 {
     return pre_auto_manage_window_bounds_.get();
   }
   void SetPreAutoManageWindowBounds(const gfx::Rect& bounds);
 
   // Layout related properties
 
   void AddObserver(WindowStateObserver* observer);
@@ skipping 79 matching lines @@
                                        intptr_t old) OVERRIDE;
   virtual void OnWindowDestroying(aura::Window* window) OVERRIDE;
 
  private:
   // Snaps the window to left or right of the desktop with given bounds.
   void SnapWindow(WindowShowType left_or_right,
                   const gfx::Rect& bounds);
 
   // The owner of this window settings.
   aura::Window* window_;
+  scoped_ptr<WindowStateDelegate> delegate_;
 
   bool tracked_by_workspace_;
   bool window_position_managed_;
   bool bounds_changed_by_user_;
   bool panel_attached_;
   bool continue_drag_after_reparent_;
   bool ignored_by_shelf_;
   bool can_consume_system_keys_;
   bool top_row_keys_are_function_keys_;
   WindowResizer* window_resizer_;
 
   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
   // restored when only this one window gets shown.
   scoped_ptr<gfx::Rect> pre_auto_manage_window_bounds_;
 
   ObserverList<WindowStateObserver> observer_list_;
 
   WindowShowType window_show_type_;
 
   DISALLOW_COPY_AND_ASSIGN(WindowState);
 };
 
 // Returns the WindowState for active window. Returns |NULL|
 // if there is no active window.
 ASH_EXPORT WindowState* GetActiveWindowState();
 
 // Returns the WindowState for |window|. Creates WindowState
 // if it didn't exist. The settings object is owned by |window|.
 ASH_EXPORT WindowState* GetWindowState(aura::Window* window);
 
 // const version of GetWindowState.
 ASH_EXPORT const WindowState*
 GetWindowState(const aura::Window* window);
 
 }  // namespace wm
 }  // namespace ash
 
 #endif  // ASH_WM_WINDOW_STATE_H_