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

ash/wm/workspace/workspace_layout_manager.h

 // Copyright (c) 2012 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_WORKSPACE_WORKSPACE_LAYOUT_MANAGER_H_
 #define ASH_WM_WORKSPACE_WORKSPACE_LAYOUT_MANAGER_H_
 
 #include <set>
 
 #include "ash/ash_export.h"
@@ skipping 59 matching lines @@
   virtual void OnWindowDestroying(aura::Window* window) OVERRIDE;
   virtual void OnWindowBoundsChanged(aura::Window* window,
                                      const gfx::Rect& old_bounds,
                                      const gfx::Rect& new_bounds) OVERRIDE;
 
   // aura::client::ActivationChangeObserver overrides:
   virtual void OnWindowActivated(aura::Window* gained_active,
                                  aura::Window* lost_active) OVERRIDE;
 
   // WindowStateObserver overrides:
-  virtual void OnWindowShowTypeChanged(wm::WindowState* window_state,
-                                       wm::WindowShowType old_type) OVERRIDE;
+  virtual void OnPostWindowShowTypeChange(wm::WindowState* window_state,
+                                          wm::WindowShowType old_type) OVERRIDE;
 
  private:
   typedef std::set<aura::Window*> WindowSet;
 
   enum AdjustWindowReason {
     ADJUST_WINDOW_DISPLAY_SIZE_CHANGED,
     ADJUST_WINDOW_WORK_AREA_INSETS_CHANGED,
   };
 
-  // Invoked from OnWindowShowTypeChanged().
-  void ShowTypeChanged(wm::WindowState* window_state,
-                       wm::WindowShowType last_show_type);
-
   // Adjusts the window's bounds when the display area changes for given
   // window. This happens when the display size, work area insets or
   // the display on which the window exists has changed.
   // If this is called for a display size change (i.e. |reason|
   // is ADJUST_WINDOW_DISPLAY_SIZE_CHANGED), the non-maximized/non-fullscreen
   // windows are readjusted to make sure the window is completely within the
   // display region. Otherwise, it makes sure at least some parts of the window
   // is on display.
   void AdjustAllWindowsBoundsForWorkAreaChange(AdjustWindowReason reason);
 
@@ skipping 13 matching lines @@
 
   // Updates the bounds of the window for a show type change from
   // |old_show_type|.
   void UpdateBoundsFromShowType(wm::WindowState* window_state,
                                 wm::WindowShowType old_show_type);
 
   // If |window_state| is maximized or fullscreen the bounds of the
   // window are set and true is returned. Does nothing otherwise.
   bool SetMaximizedOrFullscreenBounds(wm::WindowState* window_state);
 
-  // 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(wm::WindowState* window_state, gfx::Rect* bounds);
-
   // Animates the window bounds to |bounds|.
   void SetChildBoundsAnimated(aura::Window* child, const gfx::Rect& bounds);
 
   internal::ShelfLayoutManager* shelf_;
   aura::Window* window_;
   aura::Window* root_window_;
 
   // Set of windows we're listening to.
   WindowSet windows_;
 
   // The work area in the coordinates of |window_|.
   gfx::Rect work_area_in_parent_;
 
   // True if this workspace is currently in fullscreen mode.
   bool is_fullscreen_;
 
   DISALLOW_COPY_AND_ASSIGN(WorkspaceLayoutManager);
 };
 
 }  // namespace internal
 }  // namespace ash
 
 #endif  // ASH_WM_WORKSPACE_WORKSPACE_LAYOUT_MANAGER_H_