| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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/window_util.h" | 5 #include "ui/views/corewm/window_util.h" |
| 6 | 6 |
| 7 #include "ui/aura/client/activation_client.h" | 7 #include "ui/aura/client/activation_client.h" |
| 8 #include "ui/aura/root_window.h" | |
| 9 #include "ui/aura/window.h" | 8 #include "ui/aura/window.h" |
| 9 #include "ui/aura/window_event_dispatcher.h" |
| 10 #include "ui/compositor/layer.h" | 10 #include "ui/compositor/layer.h" |
| 11 #include "ui/views/corewm/transient_window_manager.h" | 11 #include "ui/views/corewm/transient_window_manager.h" |
| 12 #include "ui/views/view.h" | 12 #include "ui/views/view.h" |
| 13 #include "ui/views/widget/widget.h" | 13 #include "ui/views/widget/widget.h" |
| 14 | 14 |
| 15 namespace { | 15 namespace { |
| 16 | 16 |
| 17 // Helper method for RecreateWindowLayers() which adds all the existing layers | 17 // Helper method for RecreateWindowLayers() which adds all the existing layers |
| 18 // for |view| and its descendants to |parent_layer|. New layers are created for | 18 // for |view| and its descendants to |parent_layer|. New layers are created for |
| 19 // |view| (if it previously had a layer) and any descendants which previously | 19 // |view| (if it previously had a layer) and any descendants which previously |
| (...skipping 150 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 170 const aura::Window* ancestor) { | 170 const aura::Window* ancestor) { |
| 171 const aura::Window* transient_parent = GetTransientParent(window); | 171 const aura::Window* transient_parent = GetTransientParent(window); |
| 172 if (transient_parent == ancestor) | 172 if (transient_parent == ancestor) |
| 173 return true; | 173 return true; |
| 174 return transient_parent ? | 174 return transient_parent ? |
| 175 HasTransientAncestor(transient_parent, ancestor) : false; | 175 HasTransientAncestor(transient_parent, ancestor) : false; |
| 176 } | 176 } |
| 177 | 177 |
| 178 } // namespace corewm | 178 } // namespace corewm |
| 179 } // namespace views | 179 } // namespace views |
| OLD | NEW |