| 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 29979d734a2853c6ac107de97e116247f5d406df..f380f77d5afca0a0ec1b7fa1ccc1e417eb10661d 100644
|
| --- a/ash/wm/dock/docked_window_layout_manager.h
|
| +++ b/ash/wm/dock/docked_window_layout_manager.h
|
| @@ -143,8 +143,8 @@ class ASH_EXPORT DockedWindowLayoutManager
|
| // ash::ShellObserver:
|
| virtual void OnDisplayWorkAreaInsetsChanged() OVERRIDE;
|
| virtual void OnFullscreenStateChanged(bool is_fullscreen,
|
| - aura::RootWindow* root_window) OVERRIDE;
|
| - virtual void OnShelfAlignmentChanged(aura::RootWindow* root_window) OVERRIDE;
|
| + aura::Window* root_window) OVERRIDE;
|
| + virtual void OnShelfAlignmentChanged(aura::Window* root_window) OVERRIDE;
|
|
|
| // wm::WindowStateObserver:
|
| virtual void OnWindowShowTypeChanged(wm::WindowState* window_state,
|
|
|