| 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/aura/window.h" | 5 #include "ui/aura/window.h" |
| 6 | 6 |
| 7 #include <algorithm> | 7 #include <algorithm> |
| 8 | 8 |
| 9 #include "base/bind.h" | 9 #include "base/bind.h" |
| 10 #include "base/bind_helpers.h" | 10 #include "base/bind_helpers.h" |
| (...skipping 1171 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1182 if (direction == STACK_ABOVE) { | 1182 if (direction == STACK_ABOVE) { |
| 1183 target_layer = | 1183 target_layer = |
| 1184 FindStackingTargetLayer<Windows::const_reverse_iterator>(target, child); | 1184 FindStackingTargetLayer<Windows::const_reverse_iterator>(target, child); |
| 1185 } else { | 1185 } else { |
| 1186 target_layer = | 1186 target_layer = |
| 1187 FindStackingTargetLayer<Windows::const_iterator>(target, child); | 1187 FindStackingTargetLayer<Windows::const_iterator>(target, child); |
| 1188 } | 1188 } |
| 1189 | 1189 |
| 1190 if (!target_layer) { | 1190 if (!target_layer) { |
| 1191 if (direction == STACK_ABOVE) { | 1191 if (direction == STACK_ABOVE) { |
| 1192 for (Layers::const_reverse_iterator i = layers.rbegin(); | 1192 for (Layers::const_reverse_iterator i = layers.rbegin(), |
| 1193 i != layers.rend(); ++i) { | 1193 rend = layers.rend(); i != rend; ++i) { |
| 1194 ancestor_layer->StackAtBottom(*i); | 1194 ancestor_layer->StackAtBottom(*i); |
| 1195 } | 1195 } |
| 1196 } else { | 1196 } else { |
| 1197 for (Layers::const_iterator i = layers.begin(); i != layers.end(); ++i) | 1197 for (Layers::const_iterator i = layers.begin(); i != layers.end(); ++i) |
| 1198 ancestor_layer->StackAtTop(*i); | 1198 ancestor_layer->StackAtTop(*i); |
| 1199 } | 1199 } |
| 1200 return; | 1200 return; |
| 1201 } | 1201 } |
| 1202 | 1202 |
| 1203 if (direction == STACK_ABOVE) { | 1203 if (direction == STACK_ABOVE) { |
| 1204 for (Layers::const_reverse_iterator i = layers.rbegin(); | 1204 for (Layers::const_reverse_iterator i = layers.rbegin(), |
| 1205 i != layers.rend(); ++i) { | 1205 rend = layers.rend(); i != rend; ++i) { |
| 1206 ancestor_layer->StackAbove(*i, target_layer); | 1206 ancestor_layer->StackAbove(*i, target_layer); |
| 1207 } | 1207 } |
| 1208 } else { | 1208 } else { |
| 1209 for (Layers::const_iterator i = layers.begin(); i != layers.end(); ++i) | 1209 for (Layers::const_iterator i = layers.begin(); i != layers.end(); ++i) |
| 1210 ancestor_layer->StackBelow(*i, target_layer); | 1210 ancestor_layer->StackBelow(*i, target_layer); |
| 1211 } | 1211 } |
| 1212 } | 1212 } |
| 1213 | 1213 |
| 1214 void Window::OnStackingChanged() { | 1214 void Window::OnStackingChanged() { |
| 1215 FOR_EACH_OBSERVER(WindowObserver, observers_, OnWindowStackingChanged(this)); | 1215 FOR_EACH_OBSERVER(WindowObserver, observers_, OnWindowStackingChanged(this)); |
| (...skipping 236 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1452 return window; | 1452 return window; |
| 1453 if (offset) | 1453 if (offset) |
| 1454 *offset += window->bounds().OffsetFromOrigin(); | 1454 *offset += window->bounds().OffsetFromOrigin(); |
| 1455 } | 1455 } |
| 1456 if (offset) | 1456 if (offset) |
| 1457 *offset = gfx::Vector2d(); | 1457 *offset = gfx::Vector2d(); |
| 1458 return NULL; | 1458 return NULL; |
| 1459 } | 1459 } |
| 1460 | 1460 |
| 1461 } // namespace aura | 1461 } // namespace aura |
| OLD | NEW |