| Index: ash/wm/panels/panel_layout_manager.h
|
| diff --git a/ash/wm/panels/panel_layout_manager.h b/ash/wm/panels/panel_layout_manager.h
|
| index da5fab26f96b5aa820f3e8166fcb1d0510784766..9cc572f42679a953d5e04acb24705bffd945eacd 100644
|
| --- a/ash/wm/panels/panel_layout_manager.h
|
| +++ b/ash/wm/panels/panel_layout_manager.h
|
| @@ -84,7 +84,7 @@ class ASH_EXPORT PanelLayoutManager
|
| WmShelf* shelf() { return shelf_; }
|
| void SetShelf(WmShelf* shelf);
|
|
|
| - // WmLayoutManager:
|
| + // aura::LayoutManager:
|
| void OnWindowResized() override;
|
| void OnWindowAddedToLayout(aura::Window* child) override;
|
| void OnWillRemoveWindowFromLayout(aura::Window* child) override;
|
| @@ -98,7 +98,7 @@ class ASH_EXPORT PanelLayoutManager
|
| void OnOverviewModeEnded() override;
|
| void OnShelfAlignmentChanged(WmWindow* root_window) override;
|
| void OnVirtualKeyboardStateChanged(bool activated,
|
| - WmWindow* root_window) override;
|
| + aura::Window* root_window) override;
|
|
|
| // aura::WindowObserver
|
| void OnWindowPropertyChanged(aura::Window* window,
|
|
|