| Index: ash/wm/dock/docked_window_layout_manager.h
|
| diff --git a/ash/wm/dock/docked_window_layout_manager.h b/ash/wm/dock/docked_window_layout_manager.h
|
| index 088ebd2979473294f364e18a0a2c9d5a3196c4fd..8499d71df1439be78f1a3e18a38bf5cc657c6071 100644
|
| --- a/ash/wm/dock/docked_window_layout_manager.h
|
| +++ b/ash/wm/dock/docked_window_layout_manager.h
|
| @@ -159,8 +159,8 @@ class ASH_EXPORT DockedWindowLayoutManager
|
| BackgroundAnimatorChangeType change_type) OVERRIDE;
|
|
|
| // wm::WindowStateObserver:
|
| - virtual void OnWindowShowTypeChanged(wm::WindowState* window_state,
|
| - wm::WindowShowType old_type) OVERRIDE;
|
| + virtual void OnPreWindowShowTypeChange(wm::WindowState* window_state,
|
| + wm::WindowShowType old_type) OVERRIDE;
|
|
|
| // aura::WindowObserver:
|
| virtual void OnWindowBoundsChanged(aura::Window* window,
|
|
|