OLD | NEW |
1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 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/test/ash_test.h" | 5 #include "ash/common/test/ash_test.h" |
6 | 6 |
7 #include "ash/common/shelf/wm_shelf.h" | 7 #include "ash/common/shelf/wm_shelf.h" |
8 #include "ash/common/system/status_area_widget.h" | 8 #include "ash/common/system/status_area_widget.h" |
9 #include "ash/common/test/ash_test_impl.h" | 9 #include "ash/common/test/ash_test_impl.h" |
10 #include "ash/common/test/test_session_state_delegate.h" | 10 #include "ash/common/test/test_session_state_delegate.h" |
11 #include "ash/common/test/test_system_tray_delegate.h" | 11 #include "ash/common/test/test_system_tray_delegate.h" |
12 #include "ash/common/wm_root_window_controller.h" | 12 #include "ash/common/wm_root_window_controller.h" |
13 #include "ash/common/wm_shell.h" | 13 #include "ash/common/wm_shell.h" |
14 #include "ash/common/wm_window.h" | 14 #include "ash/common/wm_window.h" |
| 15 #include "base/memory/ptr_util.h" |
15 #include "base/run_loop.h" | 16 #include "base/run_loop.h" |
16 #include "ui/compositor/layer_type.h" | 17 #include "ui/compositor/layer_type.h" |
17 #include "ui/display/display.h" | 18 #include "ui/display/display.h" |
18 | 19 |
19 namespace ash { | 20 namespace ash { |
20 | 21 |
21 WindowOwner::WindowOwner(WmWindow* window) : window_(window) {} | 22 WindowOwner::WindowOwner(WmWindow* window) : window_(window) {} |
22 | 23 |
23 WindowOwner::~WindowOwner() { | 24 WindowOwner::~WindowOwner() { |
24 window_->Destroy(); | 25 window_->Destroy(); |
(...skipping 108 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
133 | 134 |
134 void AshTest::SetUp() { | 135 void AshTest::SetUp() { |
135 test_impl_->SetUp(); | 136 test_impl_->SetUp(); |
136 } | 137 } |
137 | 138 |
138 void AshTest::TearDown() { | 139 void AshTest::TearDown() { |
139 test_impl_->TearDown(); | 140 test_impl_->TearDown(); |
140 } | 141 } |
141 | 142 |
142 } // namespace ash | 143 } // namespace ash |
OLD | NEW |