| OLD | NEW |
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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 "ui/views/widget/window_reorderer.h" | 5 #include "ui/views/widget/window_reorderer.h" |
| 6 | 6 |
| 7 #include <stddef.h> |
| 8 |
| 7 #include <map> | 9 #include <map> |
| 8 #include <vector> | 10 #include <vector> |
| 9 | 11 |
| 12 #include "base/macros.h" |
| 10 #include "ui/aura/window.h" | 13 #include "ui/aura/window.h" |
| 11 #include "ui/views/view.h" | 14 #include "ui/views/view.h" |
| 12 #include "ui/views/view_constants_aura.h" | 15 #include "ui/views/view_constants_aura.h" |
| 13 | 16 |
| 14 namespace views { | 17 namespace views { |
| 15 | 18 |
| 16 namespace { | 19 namespace { |
| 17 | 20 |
| 18 // Sets |hosted_windows| to a mapping of the views with an associated window to | 21 // Sets |hosted_windows| to a mapping of the views with an associated window to |
| 19 // the window that they are associated to. Only views associated to a child of | 22 // the window that they are associated to. Only views associated to a child of |
| (...skipping 172 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 192 association_observer_->StopObserving(window); | 195 association_observer_->StopObserving(window); |
| 193 } | 196 } |
| 194 | 197 |
| 195 void WindowReorderer::OnWindowDestroying(aura::Window* window) { | 198 void WindowReorderer::OnWindowDestroying(aura::Window* window) { |
| 196 parent_window_->RemoveObserver(this); | 199 parent_window_->RemoveObserver(this); |
| 197 parent_window_ = NULL; | 200 parent_window_ = NULL; |
| 198 association_observer_.reset(); | 201 association_observer_.reset(); |
| 199 } | 202 } |
| 200 | 203 |
| 201 } // namespace views | 204 } // namespace views |
| OLD | NEW |