OLD | NEW |
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2013 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_stacking_client.h" | 5 #include "ui/wm/core/transient_window_stacking_client.h" |
6 | 6 |
7 #include "base/memory/scoped_ptr.h" | 7 #include "base/memory/scoped_ptr.h" |
8 #include "ui/aura/test/aura_test_base.h" | 8 #include "ui/aura/test/aura_test_base.h" |
9 #include "ui/aura/test/test_windows.h" | 9 #include "ui/aura/test/test_windows.h" |
10 #include "ui/compositor/test/test_layers.h" | 10 #include "ui/compositor/test/test_layers.h" |
11 #include "ui/views/corewm/window_util.h" | 11 #include "ui/wm/core/window_util.h" |
12 | 12 |
13 using aura::test::ChildWindowIDsAsString; | 13 using aura::test::ChildWindowIDsAsString; |
14 using aura::test::CreateTestWindowWithId; | 14 using aura::test::CreateTestWindowWithId; |
15 using aura::Window; | 15 using aura::Window; |
16 | 16 |
17 namespace views { | 17 namespace views { |
18 namespace corewm { | 18 namespace corewm { |
19 | 19 |
20 class TransientWindowStackingClientTest : public aura::test::AuraTestBase { | 20 class TransientWindowStackingClientTest : public aura::test::AuraTestBase { |
21 public: | 21 public: |
(...skipping 186 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
208 // not move in front of either. | 208 // not move in front of either. |
209 window3->layer()->set_delegate(NULL); | 209 window3->layer()->set_delegate(NULL); |
210 root_window()->StackChildBelow(window2.get(), window1.get()); | 210 root_window()->StackChildBelow(window2.get(), window1.get()); |
211 EXPECT_EQ("2 3 1", ChildWindowIDsAsString(root_window())); | 211 EXPECT_EQ("2 3 1", ChildWindowIDsAsString(root_window())); |
212 EXPECT_EQ("2 3 1", | 212 EXPECT_EQ("2 3 1", |
213 ui::test::ChildLayerNamesAsString(*root_window()->layer())); | 213 ui::test::ChildLayerNamesAsString(*root_window()->layer())); |
214 } | 214 } |
215 | 215 |
216 } // namespace corewm | 216 } // namespace corewm |
217 } // namespace views | 217 } // namespace views |
OLD | NEW |