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 "ash/shell.h" | 5 #include "ash/shell.h" |
6 #include "ash/shell_window_ids.h" | 6 #include "ash/shell_window_ids.h" |
7 #include "ash/test/ash_test_base.h" | 7 #include "ash/test/ash_test_base.h" |
8 #include "ash/wm/window_properties.h" | 8 #include "ash/wm/window_properties.h" |
9 #include "ash/wm/window_util.h" | 9 #include "ash/wm/window_util.h" |
10 #include "ui/aura/client/aura_constants.h" | 10 #include "ui/aura/client/aura_constants.h" |
11 #include "ui/aura/root_window.h" | |
12 #include "ui/aura/window.h" | 11 #include "ui/aura/window.h" |
| 12 #include "ui/aura/window_event_dispatcher.h" |
13 #include "ui/views/corewm/window_util.h" | 13 #include "ui/views/corewm/window_util.h" |
14 | 14 |
15 using aura::Window; | 15 using aura::Window; |
16 | 16 |
17 namespace ash { | 17 namespace ash { |
18 namespace internal { | 18 namespace internal { |
19 | 19 |
20 class StackingControllerTest : public test::AshTestBase { | 20 class StackingControllerTest : public test::AshTestBase { |
21 public: | 21 public: |
22 StackingControllerTest() {} | 22 StackingControllerTest() {} |
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
55 w1->Show(); | 55 w1->Show(); |
56 wm::ActivateWindow(w1.get()); | 56 wm::ActivateWindow(w1.get()); |
57 | 57 |
58 // The window with the transient parent should get added to the same container | 58 // The window with the transient parent should get added to the same container |
59 // as its transient parent. | 59 // as its transient parent. |
60 EXPECT_EQ(launcher, w1->parent()); | 60 EXPECT_EQ(launcher, w1->parent()); |
61 } | 61 } |
62 | 62 |
63 } // namespace internal | 63 } // namespace internal |
64 } // namespace ash | 64 } // namespace ash |
OLD | NEW |