| Index: ash/wm/workspace/workspace_layout_manager.h
|
| diff --git a/ash/wm/workspace/workspace_layout_manager.h b/ash/wm/workspace/workspace_layout_manager.h
|
| index 8cd44ccbfaf143c73a0a5553f1b3875e363a14cf..4a17ec5e83ccb4ee993d473b16bdee94c4cd4f8d 100644
|
| --- a/ash/wm/workspace/workspace_layout_manager.h
|
| +++ b/ash/wm/workspace/workspace_layout_manager.h
|
| @@ -77,8 +77,8 @@ class ASH_EXPORT WorkspaceLayoutManager
|
| 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;
|
| @@ -88,10 +88,6 @@ class ASH_EXPORT WorkspaceLayoutManager
|
| 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.
|
| @@ -125,10 +121,6 @@ class ASH_EXPORT WorkspaceLayoutManager
|
| // 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);
|
|
|
|
|