OLD | NEW |
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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 "chrome/browser/chromeos/login/lock/screen_locker.h" | 5 #include "chrome/browser/chromeos/login/lock/screen_locker.h" |
6 | 6 |
7 #include "ash/wm/window_state.h" | 7 #include "ash/wm/window_state.h" |
8 #include "base/command_line.h" | 8 #include "base/command_line.h" |
| 9 #include "base/macros.h" |
9 #include "base/memory/scoped_ptr.h" | 10 #include "base/memory/scoped_ptr.h" |
10 #include "base/message_loop/message_loop.h" | 11 #include "base/message_loop/message_loop.h" |
11 #include "chrome/browser/chrome_notification_types.h" | 12 #include "chrome/browser/chrome_notification_types.h" |
12 #include "chrome/browser/chromeos/login/lock/screen_locker_tester.h" | 13 #include "chrome/browser/chromeos/login/lock/screen_locker_tester.h" |
13 #include "chrome/browser/chromeos/login/ui/user_adding_screen.h" | 14 #include "chrome/browser/chromeos/login/ui/user_adding_screen.h" |
14 #include "chrome/browser/profiles/profile_manager.h" | 15 #include "chrome/browser/profiles/profile_manager.h" |
15 #include "chrome/browser/ui/browser.h" | 16 #include "chrome/browser/ui/browser.h" |
16 #include "chrome/browser/ui/browser_window.h" | 17 #include "chrome/browser/ui/browser_window.h" |
17 #include "chrome/browser/ui/exclusive_access/fullscreen_controller.h" | 18 #include "chrome/browser/ui/exclusive_access/fullscreen_controller.h" |
18 #include "chrome/browser/ui/tabs/tab_strip_model.h" | 19 #include "chrome/browser/ui/tabs/tab_strip_model.h" |
(...skipping 292 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
311 EXPECT_EQ("", tester->GetPassword()); | 312 EXPECT_EQ("", tester->GetPassword()); |
312 | 313 |
313 // Close the locker to match expectations. | 314 // Close the locker to match expectations. |
314 ScreenLocker::Hide(); | 315 ScreenLocker::Hide(); |
315 content::RunAllPendingInMessageLoop(); | 316 content::RunAllPendingInMessageLoop(); |
316 EXPECT_FALSE(tester->IsLocked()); | 317 EXPECT_FALSE(tester->IsLocked()); |
317 EXPECT_TRUE(VerifyLockScreenDismissed()); | 318 EXPECT_TRUE(VerifyLockScreenDismissed()); |
318 } | 319 } |
319 | 320 |
320 } // namespace chromeos | 321 } // namespace chromeos |
OLD | NEW |