| Index: ash/shelf/shelf_layout_manager.h
|
| diff --git a/ash/shelf/shelf_layout_manager.h b/ash/shelf/shelf_layout_manager.h
|
| index 6715b44561b9fc58c3015ea62a2155e2ac831209..06f6e67cf53988a0a1ea9c271649fc9b7f39cd19 100644
|
| --- a/ash/shelf/shelf_layout_manager.h
|
| +++ b/ash/shelf/shelf_layout_manager.h
|
| @@ -135,7 +135,7 @@ class ASH_EXPORT ShelfLayoutManager
|
|
|
| // Overridden from ShellObserver:
|
| void OnShelfAutoHideBehaviorChanged(WmWindow* root_window) override;
|
| - void OnPinnedStateChanged(WmWindow* pinned_window) override;
|
| + void OnPinnedStateChanged(aura::Window* pinned_window) override;
|
| void OnVirtualKeyboardStateChanged(bool activated,
|
| aura::Window* root_window) override;
|
|
|
|
|