| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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 "services/ui/ws/server_window.h" | 5 #include "services/ui/ws/server_window.h" |
| 6 | 6 |
| 7 #include <inttypes.h> | 7 #include <inttypes.h> |
| 8 #include <stddef.h> | 8 #include <stddef.h> |
| 9 | 9 |
| 10 #include "base/memory/ptr_util.h" | 10 #include "base/memory/ptr_util.h" |
| (...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 50 for (auto& observer : observers_) | 50 for (auto& observer : observers_) |
| 51 observer.OnWindowDestroying(this); | 51 observer.OnWindowDestroying(this); |
| 52 | 52 |
| 53 if (transient_parent_) | 53 if (transient_parent_) |
| 54 transient_parent_->RemoveTransientWindow(this); | 54 transient_parent_->RemoveTransientWindow(this); |
| 55 | 55 |
| 56 // Destroy transient children, only after we've removed ourselves from our | 56 // Destroy transient children, only after we've removed ourselves from our |
| 57 // parent, as destroying an active transient child may otherwise attempt to | 57 // parent, as destroying an active transient child may otherwise attempt to |
| 58 // refocus us. | 58 // refocus us. |
| 59 Windows transient_children(transient_children_); | 59 Windows transient_children(transient_children_); |
| 60 for (auto window : transient_children) | 60 for (auto* window : transient_children) |
| 61 delete window; | 61 delete window; |
| 62 DCHECK(transient_children_.empty()); | 62 DCHECK(transient_children_.empty()); |
| 63 | 63 |
| 64 while (!children_.empty()) | 64 while (!children_.empty()) |
| 65 children_.front()->parent()->Remove(children_.front()); | 65 children_.front()->parent()->Remove(children_.front()); |
| 66 | 66 |
| 67 if (parent_) | 67 if (parent_) |
| 68 parent_->Remove(this); | 68 parent_->Remove(this); |
| 69 | 69 |
| 70 for (auto& observer : observers_) | 70 for (auto& observer : observers_) |
| (...skipping 410 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 481 window->OnStackingChanged(); | 481 window->OnStackingChanged(); |
| 482 } | 482 } |
| 483 | 483 |
| 484 // static | 484 // static |
| 485 ServerWindow** ServerWindow::GetStackingTarget(ServerWindow* window) { | 485 ServerWindow** ServerWindow::GetStackingTarget(ServerWindow* window) { |
| 486 return &window->stacking_target_; | 486 return &window->stacking_target_; |
| 487 } | 487 } |
| 488 | 488 |
| 489 } // namespace ws | 489 } // namespace ws |
| 490 } // namespace ui | 490 } // namespace ui |
| OLD | NEW |