| Index: ash/wm/panels/panel_layout_manager.cc
|
| diff --git a/ash/wm/panels/panel_layout_manager.cc b/ash/wm/panels/panel_layout_manager.cc
|
| index aaedc7c3a29ebf1e38e10da9b7cff5dd053a614f..81f8fe83fdd86f4cbac840ecd68f4dd17cddc6ed 100644
|
| --- a/ash/wm/panels/panel_layout_manager.cc
|
| +++ b/ash/wm/panels/panel_layout_manager.cc
|
| @@ -337,7 +337,7 @@ views::Widget* PanelLayoutManager::GetCalloutWidgetForPanel(WmWindow* panel) {
|
| }
|
|
|
| ////////////////////////////////////////////////////////////////////////////////
|
| -// PanelLayoutManager, WmLayoutManager implementation:
|
| +// PanelLayoutManager, aura::LayoutManager implementation:
|
| void PanelLayoutManager::OnWindowResized() {
|
| Relayout();
|
| }
|
| @@ -458,11 +458,12 @@ void PanelLayoutManager::OnShelfAlignmentChanged(WmWindow* root_window) {
|
| Relayout();
|
| }
|
|
|
| -void PanelLayoutManager::OnVirtualKeyboardStateChanged(bool activated,
|
| - WmWindow* root_window) {
|
| - UpdateKeyboardObserverFromStateChanged(activated, root_window,
|
| - panel_container_->GetRootWindow(),
|
| - &keyboard_observer_);
|
| +void PanelLayoutManager::OnVirtualKeyboardStateChanged(
|
| + bool activated,
|
| + aura::Window* root_window) {
|
| + UpdateKeyboardObserverFromStateChanged(
|
| + activated, root_window, panel_container_->GetRootWindow()->aura_window(),
|
| + &keyboard_observer_);
|
| }
|
|
|
| /////////////////////////////////////////////////////////////////////////////
|
|
|