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 "ash/session/session_state_delegate.h" | 5 #include "ash/session/session_state_delegate.h" |
6 #include "ash/shell.h" | 6 #include "ash/shell.h" |
| 7 #include "base/macros.h" |
7 #include "base/prefs/pref_service.h" | 8 #include "base/prefs/pref_service.h" |
8 #include "chrome/browser/chrome_notification_types.h" | 9 #include "chrome/browser/chrome_notification_types.h" |
9 #include "chrome/browser/chromeos/login/lock/screen_locker.h" | 10 #include "chrome/browser/chromeos/login/lock/screen_locker.h" |
10 #include "chrome/browser/chromeos/login/lock/screen_locker_tester.h" | 11 #include "chrome/browser/chromeos/login/lock/screen_locker_tester.h" |
11 #include "chrome/browser/chromeos/login/login_manager_test.h" | 12 #include "chrome/browser/chromeos/login/login_manager_test.h" |
12 #include "chrome/browser/chromeos/login/startup_utils.h" | 13 #include "chrome/browser/chromeos/login/startup_utils.h" |
13 #include "chrome/browser/chromeos/login/ui/login_display_host_impl.h" | 14 #include "chrome/browser/chromeos/login/ui/login_display_host_impl.h" |
14 #include "chrome/browser/chromeos/login/ui/user_adding_screen.h" | 15 #include "chrome/browser/chromeos/login/ui/user_adding_screen.h" |
15 #include "chrome/browser/chromeos/login/ui/webui_login_view.h" | 16 #include "chrome/browser/chromeos/login/ui/webui_login_view.h" |
16 #include "chrome/browser/chromeos/login/users/multi_profile_user_controller.h" | 17 #include "chrome/browser/chromeos/login/users/multi_profile_user_controller.h" |
(...skipping 245 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
262 content::NotificationService::AllSources()).Wait(); | 263 content::NotificationService::AllSources()).Wait(); |
263 | 264 |
264 UserAddingScreen::Get()->Start(); | 265 UserAddingScreen::Get()->Start(); |
265 content::RunAllPendingInMessageLoop(); | 266 content::RunAllPendingInMessageLoop(); |
266 CheckScreenIsVisible(); | 267 CheckScreenIsVisible(); |
267 UserAddingScreen::Get()->Cancel(); | 268 UserAddingScreen::Get()->Cancel(); |
268 content::RunAllPendingInMessageLoop(); | 269 content::RunAllPendingInMessageLoop(); |
269 } | 270 } |
270 | 271 |
271 } // namespace chromeos | 272 } // namespace chromeos |
OLD | NEW |