OLD | NEW |
1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 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/public/cpp/shell_window_ids.h" | 5 #include "ash/public/cpp/shell_window_ids.h" |
6 #include "ash/session/session_controller.h" | 6 #include "ash/session/session_controller.h" |
7 #include "ash/shell.h" | 7 #include "ash/shell.h" |
8 #include "ash/test/ash_test_base.h" | 8 #include "ash/test/ash_test_base.h" |
9 #include "ash/test/ash_test_helper.h" | 9 #include "ash/test/ash_test_helper.h" |
10 #include "ash/test/test_session_controller_client.h" | 10 #include "ash/test/test_session_controller_client.h" |
11 #include "ash/wm/lock_state_controller.h" | 11 #include "ash/wm/lock_state_controller.h" |
12 #include "ash/wm/window_state.h" | 12 #include "ash/wm/window_state.h" |
13 #include "ash/wm/window_state_aura.h" | 13 #include "ash/wm/window_state_aura.h" |
14 #include "ash/wm/window_util.h" | 14 #include "ash/wm/window_util.h" |
15 #include "ash/wm_shell.h" | |
16 #include "base/memory/ptr_util.h" | 15 #include "base/memory/ptr_util.h" |
17 #include "services/ui/public/interfaces/window_manager_constants.mojom.h" | 16 #include "services/ui/public/interfaces/window_manager_constants.mojom.h" |
18 #include "ui/aura/client/aura_constants.h" | 17 #include "ui/aura/client/aura_constants.h" |
19 #include "ui/aura/client/window_parenting_client.h" | 18 #include "ui/aura/client/window_parenting_client.h" |
20 #include "ui/views/test/widget_test.h" | 19 #include "ui/views/test/widget_test.h" |
21 #include "ui/views/view.h" | 20 #include "ui/views/view.h" |
22 #include "ui/views/widget/widget.h" | 21 #include "ui/views/widget/widget.h" |
23 | 22 |
24 namespace ash { | 23 namespace ash { |
25 namespace test { | 24 namespace test { |
(...skipping 169 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
195 EXPECT_FALSE(delegate.view()->HasFocus()); | 194 EXPECT_FALSE(delegate.view()->HasFocus()); |
196 | 195 |
197 UnblockUserSession(); | 196 UnblockUserSession(); |
198 EXPECT_FALSE(Shell::Get()->session_controller()->IsScreenLocked()); | 197 EXPECT_FALSE(Shell::Get()->session_controller()->IsScreenLocked()); |
199 EXPECT_TRUE(delegate.GetWidget()->IsActive()); | 198 EXPECT_TRUE(delegate.GetWidget()->IsActive()); |
200 EXPECT_TRUE(delegate.view()->HasFocus()); | 199 EXPECT_TRUE(delegate.view()->HasFocus()); |
201 } | 200 } |
202 | 201 |
203 } // namespace test | 202 } // namespace test |
204 } // namespace ash | 203 } // namespace ash |
OLD | NEW |