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/wm/core/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/window.h" | 8 #include "ui/aura/window.h" |
9 #include "ui/aura/window_event_dispatcher.h" | 9 #include "ui/aura/window_event_dispatcher.h" |
10 #include "ui/compositor/layer.h" | 10 #include "ui/compositor/layer.h" |
11 #include "ui/compositor/layer_tree_owner.h" | 11 #include "ui/compositor/layer_tree_owner.h" |
12 #include "ui/views/corewm/transient_window_manager.h" | 12 #include "ui/wm/core/transient_window_manager.h" |
13 | 13 |
14 namespace { | 14 namespace { |
15 | 15 |
16 // Invokes RecreateLayer() on all the children of |to_clone|, adding the newly | 16 // Invokes RecreateLayer() on all the children of |to_clone|, adding the newly |
17 // cloned children to |parent|. | 17 // cloned children to |parent|. |
18 // | 18 // |
19 // WARNING: It is assumed that |parent| is ultimately owned by a LayerTreeOwner. | 19 // WARNING: It is assumed that |parent| is ultimately owned by a LayerTreeOwner. |
20 void CloneChildren(ui::Layer* to_clone, ui::Layer* parent) { | 20 void CloneChildren(ui::Layer* to_clone, ui::Layer* parent) { |
21 typedef std::vector<ui::Layer*> Layers; | 21 typedef std::vector<ui::Layer*> Layers; |
22 // Make a copy of the children since RecreateLayer() mutates it. | 22 // Make a copy of the children since RecreateLayer() mutates it. |
(...skipping 99 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
122 const aura::Window* ancestor) { | 122 const aura::Window* ancestor) { |
123 const aura::Window* transient_parent = GetTransientParent(window); | 123 const aura::Window* transient_parent = GetTransientParent(window); |
124 if (transient_parent == ancestor) | 124 if (transient_parent == ancestor) |
125 return true; | 125 return true; |
126 return transient_parent ? | 126 return transient_parent ? |
127 HasTransientAncestor(transient_parent, ancestor) : false; | 127 HasTransientAncestor(transient_parent, ancestor) : false; |
128 } | 128 } |
129 | 129 |
130 } // namespace corewm | 130 } // namespace corewm |
131 } // namespace views | 131 } // namespace views |
OLD | NEW |