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/mus/test/wm_test_base.h" | 5 #include "ash/mus/test/wm_test_base.h" |
6 | 6 |
7 #include <algorithm> | 7 #include <algorithm> |
8 #include <vector> | 8 #include <vector> |
9 | 9 |
10 #include "ash/common/session/session_controller.h" | |
11 #include "ash/common/wm_shell.h" | |
12 #include "ash/mus/test/wm_test_helper.h" | 10 #include "ash/mus/test/wm_test_helper.h" |
13 #include "ash/mus/top_level_window_factory.h" | 11 #include "ash/mus/top_level_window_factory.h" |
14 #include "ash/mus/window_manager.h" | 12 #include "ash/mus/window_manager.h" |
15 #include "ash/mus/window_manager_application.h" | 13 #include "ash/mus/window_manager_application.h" |
16 #include "ash/public/cpp/session_types.h" | 14 #include "ash/public/cpp/session_types.h" |
17 #include "ash/public/interfaces/session_controller.mojom.h" | 15 #include "ash/public/interfaces/session_controller.mojom.h" |
| 16 #include "ash/session/session_controller.h" |
18 #include "ash/test/wm_window_test_api.h" | 17 #include "ash/test/wm_window_test_api.h" |
| 18 #include "ash/wm_shell.h" |
19 #include "base/memory/ptr_util.h" | 19 #include "base/memory/ptr_util.h" |
20 #include "services/ui/public/cpp/property_type_converters.h" | 20 #include "services/ui/public/cpp/property_type_converters.h" |
21 #include "ui/aura/mus/property_converter.h" | 21 #include "ui/aura/mus/property_converter.h" |
22 #include "ui/aura/mus/window_tree_client.h" | 22 #include "ui/aura/mus/window_tree_client.h" |
23 #include "ui/aura/window.h" | 23 #include "ui/aura/window.h" |
24 #include "ui/compositor/scoped_animation_duration_scale_mode.h" | 24 #include "ui/compositor/scoped_animation_duration_scale_mode.h" |
25 #include "ui/display/display.h" | 25 #include "ui/display/display.h" |
26 | 26 |
27 namespace ash { | 27 namespace ash { |
28 namespace mus { | 28 namespace mus { |
(...skipping 168 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
197 info->can_lock_screen = true; | 197 info->can_lock_screen = true; |
198 info->should_lock_screen_automatically = false; | 198 info->should_lock_screen_automatically = false; |
199 info->add_user_session_policy = AddUserSessionPolicy::ALLOWED; | 199 info->add_user_session_policy = AddUserSessionPolicy::ALLOWED; |
200 info->state = session_manager::SessionState::ACTIVE; | 200 info->state = session_manager::SessionState::ACTIVE; |
201 session_controller->SetSessionInfo(std::move(info)); | 201 session_controller->SetSessionInfo(std::move(info)); |
202 } | 202 } |
203 | 203 |
204 | 204 |
205 } // namespace mus | 205 } // namespace mus |
206 } // namespace ash | 206 } // namespace ash |
OLD | NEW |