| OLD | NEW |
| 1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "ash/mus/disconnected_app_handler.h" | 5 #include "ash/mus/disconnected_app_handler.h" |
| 6 | 6 |
| 7 #include "ash/common/shell_window_ids.h" | |
| 8 #include "ash/mus/bridge/wm_window_mus.h" | 7 #include "ash/mus/bridge/wm_window_mus.h" |
| 8 #include "ash/public/cpp/shell_window_ids.h" |
| 9 | 9 |
| 10 namespace ash { | 10 namespace ash { |
| 11 namespace mus { | 11 namespace mus { |
| 12 namespace { | 12 namespace { |
| 13 | 13 |
| 14 bool IsContainer(ui::Window* window) { | 14 bool IsContainer(ui::Window* window) { |
| 15 return WmWindowMus::Get(window)->IsContainer(); | 15 return WmWindowMus::Get(window)->IsContainer(); |
| 16 } | 16 } |
| 17 | 17 |
| 18 } // namespace | 18 } // namespace |
| (...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 60 Remove(params.target); | 60 Remove(params.target); |
| 61 | 61 |
| 62 if (params.new_parent == params.receiver && IsContainer(params.new_parent)) | 62 if (params.new_parent == params.receiver && IsContainer(params.new_parent)) |
| 63 Add(params.target); | 63 Add(params.target); |
| 64 | 64 |
| 65 ui::WindowTracker::OnTreeChanging(params); | 65 ui::WindowTracker::OnTreeChanging(params); |
| 66 } | 66 } |
| 67 | 67 |
| 68 } // namespace mus | 68 } // namespace mus |
| 69 } // namespace ash | 69 } // namespace ash |
| OLD | NEW |