| Index: ash/shelf/shelf_layout_manager.h
|
| diff --git a/ash/shelf/shelf_layout_manager.h b/ash/shelf/shelf_layout_manager.h
|
| index fec5bff43acd85ab61aaedff923b889450e71be7..9b45f51dbd547667e9a0b3ea56e62aa77dd4c51d 100644
|
| --- a/ash/shelf/shelf_layout_manager.h
|
| +++ b/ash/shelf/shelf_layout_manager.h
|
| @@ -167,8 +167,8 @@ class ASH_EXPORT ShelfLayoutManager
|
|
|
| // Overridden from ash::ShellObserver:
|
| void OnLockStateChanged(bool locked) override;
|
| - void OnShelfAlignmentChanged(aura::Window* root_window) override;
|
| - void OnShelfAutoHideBehaviorChanged(aura::Window* root_window) override;
|
| + void OnShelfAlignmentChanged(WmWindow* root_window) override;
|
| + void OnShelfAutoHideBehaviorChanged(WmWindow* root_window) override;
|
|
|
| // Overriden from aura::client::ActivationChangeObserver:
|
| void OnWindowActivated(
|
|
|