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/common/shell_window_ids.h" | 5 #include "ash/common/shell_window_ids.h" |
6 #include "ash/shell.h" | 6 #include "ash/shell.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" |
(...skipping 22 matching lines...) Expand all Loading... |
33 DISALLOW_COPY_AND_ASSIGN(StackingControllerTest); | 33 DISALLOW_COPY_AND_ASSIGN(StackingControllerTest); |
34 }; | 34 }; |
35 | 35 |
36 // Verifies a window with a transient parent is in the same container as its | 36 // Verifies a window with a transient parent is in the same container as its |
37 // transient parent. | 37 // transient parent. |
38 TEST_F(StackingControllerTest, TransientParent) { | 38 TEST_F(StackingControllerTest, TransientParent) { |
39 // Normal window . | 39 // Normal window . |
40 std::unique_ptr<Window> w2(CreateTestWindow()); | 40 std::unique_ptr<Window> w2(CreateTestWindow()); |
41 w2->SetBounds(gfx::Rect(10, 11, 250, 251)); | 41 w2->SetBounds(gfx::Rect(10, 11, 250, 251)); |
42 aura::Window* launcher = Shell::GetContainer(Shell::GetPrimaryRootWindow(), | 42 aura::Window* launcher = Shell::GetContainer(Shell::GetPrimaryRootWindow(), |
43 kShellWindowId_ShelfContainer); | 43 kShellWindowId_ShelfContainer); |
44 launcher->AddChild(w2.get()); | 44 launcher->AddChild(w2.get()); |
45 w2->Show(); | 45 w2->Show(); |
46 | 46 |
47 wm::ActivateWindow(w2.get()); | 47 wm::ActivateWindow(w2.get()); |
48 | 48 |
49 // Window with a transient parent. | 49 // Window with a transient parent. |
50 std::unique_ptr<Window> w1(CreateTestWindow()); | 50 std::unique_ptr<Window> w1(CreateTestWindow()); |
51 ::wm::AddTransientChild(w2.get(), w1.get()); | 51 ::wm::AddTransientChild(w2.get(), w1.get()); |
52 w1->SetBounds(gfx::Rect(10, 11, 250, 251)); | 52 w1->SetBounds(gfx::Rect(10, 11, 250, 251)); |
53 ParentWindowInPrimaryRootWindow(w1.get()); | 53 ParentWindowInPrimaryRootWindow(w1.get()); |
54 w1->Show(); | 54 w1->Show(); |
55 wm::ActivateWindow(w1.get()); | 55 wm::ActivateWindow(w1.get()); |
56 | 56 |
57 // The window with the transient parent should get added to the same container | 57 // The window with the transient parent should get added to the same container |
58 // as its transient parent. | 58 // as its transient parent. |
59 EXPECT_EQ(launcher, w1->parent()); | 59 EXPECT_EQ(launcher, w1->parent()); |
60 } | 60 } |
61 | 61 |
62 } // namespace ash | 62 } // namespace ash |
OLD | NEW |