[Refactor] Move the logic to update bounds for show type from WorkspaceLayoutManager to DefaultState

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/drag_details.h"
 #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 {
+namespace internal {
+class WorkspaceLayoutManager;
+}
 
 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*
@@ skipping 51 matching lines @@
   bool IsNormalShowState() const;
 
   // True if the window's show type is SHOW_TYPE_NORMAL or SHOW_TYPE_DEFAULT.
   // Unlike IsNormalShowState(), returns false if the window's show type is
   // SHOW_TYPE_LEFT_SNAPPED or SHOW_TYPE_RIGHT_SNAPPED.
   bool IsNormalShowType() const;
 
   bool IsActive() const;
   bool IsDocked() const;
   bool IsSnapped() const;
+  bool IsPanel() const;
 
   // Checks if the window can change its state accordingly.
   bool CanMaximize() const;
   bool CanMinimize() const;
   bool CanResize() const;
   bool CanSnap() const;
   bool CanActivate() const;
 
   // Returns true if the window has restore bounds.
   bool HasRestoreBounds() const;
@@ skipping 157 matching lines @@
                          int window_component,
                          aura::client::WindowMoveSource source);
 
   // Deletes and clears a pointer to DragDetails. This should be done when the
   // resizer gets destroyed.
   void DeleteDragDetails();
 
   // Sets the currently stored restore bounds and clears the restore bounds.
   void SetAndClearRestoreBounds();
 
+  // Adjusts the |bounds| so that they are flush with the edge of the
+  // workspace if the window represented by |window_state| is side snapped.
+  void AdjustSnappedBounds(gfx::Rect* bounds);
+
   // Returns a pointer to DragDetails during drag operations.
   const DragDetails* drag_details() const { return drag_details_.get(); }
   DragDetails* drag_details() { return drag_details_.get(); }
 
   // aura::WindowObserver overrides:
   virtual void OnWindowPropertyChanged(aura::Window* window,
                                        const void* key,
                                        intptr_t old) OVERRIDE;
 
  private:
+  friend class DefaultState;
+  // TODO(oshima): Move more logic from WLM to this class and remove
+  // this friend.
+  friend class internal::WorkspaceLayoutManager;
+
+  WindowStateDelegate* delegate() { return delegate_.get(); }
+
   // Snaps the window to left or right of the desktop with given bounds.
   void SnapWindow(WindowShowType left_or_right,
                   const gfx::Rect& bounds);
 
   // Sets the window show type and updates the show state if necessary.
-  void SetWindowShowType(WindowShowType new_window_show_type);
+  // Note that this does not update the window bounds.
+  void UpdateWindowShowType(WindowShowType new_window_show_type);
+
+  void NotifyPreShowTypeChange(WindowShowType old_window_show_type);
+  void NotifyPostShowTypeChange(WindowShowType old_window_show_type);
+
+  void SetBoundsDirect(const gfx::Rect& bounds);
+  void SetBoundsDirectAnimated(const gfx::Rect& bounds);
 
   // The owner of this window settings.
   aura::Window* window_;
   scoped_ptr<WindowStateDelegate> delegate_;
 
   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_;
   scoped_ptr<DragDetails> drag_details_;
 
   bool unminimize_to_restore_bounds_;
   bool hide_shelf_when_fullscreen_;
   bool animate_to_fullscreen_;
   bool minimum_visibility_;
 
   // 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_;
 
-  // True when in SetWindowShowType(). This is used to avoid reentrance.
-  bool in_set_window_show_type_;
+  // True to ignore a property change event to avoid reentrance.

[pkotwicz, 2014/02/12 22:27:27]

How about: "True to ignore a property change event to avoid reentrance in
UpdateWindowShowType()."

[oshima, 2014/02/13 14:52:34]

Done.

+  bool ignore_property_change_;
 
   WindowShowType window_show_type_;
 
   scoped_ptr<State> current_state_;
 
   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_