| 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/wm/core/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/aura/window_tracker.h" |
| 14 #include "ui/wm/core/transient_window_observer.h" | 15 #include "ui/wm/core/transient_window_observer.h" |
| 15 #include "ui/wm/core/transient_window_stacking_client.h" | 16 #include "ui/wm/core/transient_window_stacking_client.h" |
| 16 #include "ui/wm/core/window_util.h" | 17 #include "ui/wm/core/window_util.h" |
| 17 | 18 |
| 18 using aura::Window; | 19 using aura::Window; |
| 19 | 20 |
| 20 DECLARE_WINDOW_PROPERTY_TYPE(wm::TransientWindowManager*); | 21 DECLARE_WINDOW_PROPERTY_TYPE(wm::TransientWindowManager*); |
| 21 | 22 |
| 22 namespace wm { | 23 namespace wm { |
| 23 namespace { | 24 namespace { |
| (...skipping 131 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 155 } | 156 } |
| 156 } | 157 } |
| 157 | 158 |
| 158 void TransientWindowManager::OnWindowVisibilityChanged(Window* window, | 159 void TransientWindowManager::OnWindowVisibilityChanged(Window* window, |
| 159 bool visible) { | 160 bool visible) { |
| 160 if (window_ != window) | 161 if (window_ != window) |
| 161 return; | 162 return; |
| 162 | 163 |
| 163 // If the window has transient children, updates the transient children's | 164 // If the window has transient children, updates the transient children's |
| 164 // visiblity as well. | 165 // visiblity as well. |
| 166 // WindowTracker is used because child window |
| 167 // could be deleted inside UpdateTransientChildVisibility call. |
| 168 aura::WindowTracker tracker; |
| 165 for (Window* child : transient_children_) | 169 for (Window* child : transient_children_) |
| 166 Get(child)->UpdateTransientChildVisibility(visible); | 170 tracker.Add(child); |
| 171 |
| 172 while (!tracker.windows().empty()) { |
| 173 Window* window = *(tracker.windows().begin()); |
| 174 Get(window)->UpdateTransientChildVisibility(visible); |
| 175 tracker.Remove(window); |
| 176 } |
| 167 | 177 |
| 168 // Remember the show request in |show_on_parent_visible_| and hide it again | 178 // Remember the show request in |show_on_parent_visible_| and hide it again |
| 169 // if the following conditions are met | 179 // if the following conditions are met |
| 170 // - |parent_controls_visibility| is set to true. | 180 // - |parent_controls_visibility| is set to true. |
| 171 // - the window is hidden while the transient parent is not visible. | 181 // - the window is hidden while the transient parent is not visible. |
| 172 // - Show/Hide was NOT called from TransientWindowManager. | 182 // - Show/Hide was NOT called from TransientWindowManager. |
| 173 if (ignore_visibility_changed_event_ || | 183 if (ignore_visibility_changed_event_ || |
| 174 !transient_parent_ || !parent_controls_visibility_) { | 184 !transient_parent_ || !parent_controls_visibility_) { |
| 175 return; | 185 return; |
| 176 } | 186 } |
| (...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 213 | 223 |
| 214 // Destroy transient children, only after we've removed ourselves from our | 224 // Destroy transient children, only after we've removed ourselves from our |
| 215 // parent, as destroying an active transient child may otherwise attempt to | 225 // parent, as destroying an active transient child may otherwise attempt to |
| 216 // refocus us. | 226 // refocus us. |
| 217 Windows transient_children(transient_children_); | 227 Windows transient_children(transient_children_); |
| 218 STLDeleteElements(&transient_children); | 228 STLDeleteElements(&transient_children); |
| 219 DCHECK(transient_children_.empty()); | 229 DCHECK(transient_children_.empty()); |
| 220 } | 230 } |
| 221 | 231 |
| 222 } // namespace wm | 232 } // namespace wm |
| OLD | NEW |