| 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 a9241a6300cffb474bf65aaec3c1bb4de89fd52f..607a099688f42eba0858b616ed2f0ce8772d9b82 100644
|
| --- a/ash/wm/workspace/workspace_layout_manager.h
|
| +++ b/ash/wm/workspace/workspace_layout_manager.h
|
| @@ -62,26 +62,26 @@ class ASH_EXPORT WorkspaceLayoutManager : public BaseLayoutManager {
|
|
|
| private:
|
| // Overridden from BaseLayoutManager:
|
| - virtual void ShowStateChanged(aura::Window* window,
|
| + virtual void ShowStateChanged(wm::WindowState* window_state,
|
| ui::WindowShowState last_show_state) OVERRIDE;
|
| virtual void AdjustAllWindowsBoundsForWorkAreaChange(
|
| AdjustWindowReason reason) OVERRIDE;
|
| virtual void AdjustWindowBoundsForWorkAreaChange(
|
| - aura::Window* window,
|
| + wm::WindowState* window_state,
|
| AdjustWindowReason reason) OVERRIDE;
|
|
|
| - void AdjustWindowBoundsWhenAdded(aura::Window* window);
|
| + void AdjustWindowBoundsWhenAdded(wm::WindowState* window_state);
|
|
|
| void UpdateDesktopVisibility();
|
|
|
| // Updates the bounds of the window for a show state change from
|
| // |last_show_state|.
|
| - void UpdateBoundsFromShowState(aura::Window* window,
|
| + void UpdateBoundsFromShowState(wm::WindowState* window_state,
|
| ui::WindowShowState last_show_state);
|
|
|
| - // If |window| is maximized or fullscreen the bounds of the window are set and
|
| - // true is returned. Does nothing otherwise.
|
| - bool SetMaximizedOrFullscreenBounds(aura::Window* window);
|
| + // 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);
|
|
|
| internal::ShelfLayoutManager* shelf_;
|
| aura::Window* window_;
|
|
|