Chromium Code Reviews| 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 a19c24568ab7383d1f2629a73e998014ec12810a..052b294fab4cb4ea176258c8368e08b7c524226d 100644 |
| --- a/ash/wm/panels/panel_layout_manager.cc |
| +++ b/ash/wm/panels/panel_layout_manager.cc |
| @@ -484,6 +484,22 @@ void PanelLayoutManager::OnWindowPropertyChanged(aura::Window* window, |
| ///////////////////////////////////////////////////////////////////////////// |
| // PanelLayoutManager, WindowStateObserver implementation: |
| +void PanelLayoutManager::OnPreWindowStateTypeChange( |
|
varkha
2014/09/24 03:16:23
Would be nice to move this into some place that is
dtapuska
2014/09/25 23:27:09
I collapsed the moving code; but the state managem
|
| + wm::WindowState* window_state, |
| + wm::WindowStateType old_type) { |
| + aura::Window* window = window_state->window(); |
| + if (window_state->IsDocked()) { |
| + // Reparent the window into the docked windows container in order to get it |
| + // on top of other docked windows. |
| + aura::Window* docked_container = Shell::GetContainer( |
| + window->GetRootWindow(), |
| + kShellWindowId_DockedContainer); |
| + wm::ReparentChildWithTransientChildren(window, |
| + window->parent(), |
| + docked_container); |
| + } |
| +} |
| + |
| void PanelLayoutManager::OnPostWindowStateTypeChange( |
| wm::WindowState* window_state, |
| wm::WindowStateType old_type) { |