| 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 "ui/views/corewm/transient_window_manager.h" | 5 #include "ui/wm/core/transient_window_manager.h" | 
| 6 | 6 | 
| 7 #include <algorithm> | 7 #include <algorithm> | 
| 8 #include <functional> | 8 #include <functional> | 
| 9 | 9 | 
| 10 #include "base/auto_reset.h" | 10 #include "base/auto_reset.h" | 
| 11 #include "base/stl_util.h" | 11 #include "base/stl_util.h" | 
| 12 #include "ui/aura/window.h" | 12 #include "ui/aura/window.h" | 
| 13 #include "ui/aura/window_property.h" | 13 #include "ui/aura/window_property.h" | 
| 14 #include "ui/views/corewm/transient_window_observer.h" | 14 #include "ui/wm/core/transient_window_observer.h" | 
| 15 #include "ui/views/corewm/transient_window_stacking_client.h" | 15 #include "ui/wm/core/transient_window_stacking_client.h" | 
| 16 #include "ui/views/corewm/window_util.h" | 16 #include "ui/wm/core/window_util.h" | 
| 17 | 17 | 
| 18 using aura::Window; | 18 using aura::Window; | 
| 19 | 19 | 
| 20 namespace views { | 20 namespace views { | 
| 21 namespace corewm { | 21 namespace corewm { | 
| 22 | 22 | 
| 23 DEFINE_OWNED_WINDOW_PROPERTY_KEY(TransientWindowManager, kPropertyKey, NULL); | 23 DEFINE_OWNED_WINDOW_PROPERTY_KEY(TransientWindowManager, kPropertyKey, NULL); | 
| 24 | 24 | 
| 25 TransientWindowManager::~TransientWindowManager() { | 25 TransientWindowManager::~TransientWindowManager() { | 
| 26 } | 26 } | 
| (...skipping 120 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 147   // parent, as destroying an active transient child may otherwise attempt to | 147   // parent, as destroying an active transient child may otherwise attempt to | 
| 148   // refocus us. | 148   // refocus us. | 
| 149   // NOTE: this use to be after removed from parent, now its before. | 149   // NOTE: this use to be after removed from parent, now its before. | 
| 150   Windows transient_children(transient_children_); | 150   Windows transient_children(transient_children_); | 
| 151   STLDeleteElements(&transient_children); | 151   STLDeleteElements(&transient_children); | 
| 152   DCHECK(transient_children_.empty()); | 152   DCHECK(transient_children_.empty()); | 
| 153 } | 153 } | 
| 154 | 154 | 
| 155 }  // namespace corewm | 155 }  // namespace corewm | 
| 156 }  // namespace views | 156 }  // namespace views | 
| OLD | NEW | 
|---|