| 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/window.h" | 11 #include "ui/aura/window.h" |
| 12 #include "ui/aura/window_event_dispatcher.h" | 12 #include "ui/aura/window_event_dispatcher.h" |
| 13 #include "ui/wm/core/window_util.h" | 13 #include "ui/wm/core/window_util.h" |
| 14 | 14 |
| 15 using aura::Window; | 15 using aura::Window; |
| 16 | 16 |
| 17 namespace ash { | 17 namespace ash { |
| 18 | 18 |
| 19 class StackingControllerTest : public test::AshTestBase { | 19 class StackingControllerTest : public test::AshTestBase { |
| 20 public: | 20 public: |
| 21 StackingControllerTest() {} | 21 StackingControllerTest() {} |
| 22 virtual ~StackingControllerTest() {} | 22 ~StackingControllerTest() override {} |
| 23 | 23 |
| 24 aura::Window* CreateTestWindow() { | 24 aura::Window* CreateTestWindow() { |
| 25 aura::Window* window = new aura::Window(NULL); | 25 aura::Window* window = new aura::Window(NULL); |
| 26 window->SetProperty(aura::client::kShowStateKey, ui::SHOW_STATE_NORMAL); | 26 window->SetProperty(aura::client::kShowStateKey, ui::SHOW_STATE_NORMAL); |
| 27 window->SetType(ui::wm::WINDOW_TYPE_NORMAL); | 27 window->SetType(ui::wm::WINDOW_TYPE_NORMAL); |
| 28 window->Init(aura::WINDOW_LAYER_TEXTURED); | 28 window->Init(aura::WINDOW_LAYER_TEXTURED); |
| 29 return window; | 29 return window; |
| 30 } | 30 } |
| 31 | 31 |
| 32 private: | 32 private: |
| (...skipping 20 matching lines...) Expand all Loading... |
| 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 |