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/ui/webui_login_display.h" | 5 #include "chrome/browser/chromeos/login/ui/webui_login_display.h" |
6 | 6 |
7 #include "chrome/browser/chromeos/accessibility/accessibility_manager.h" | 7 #include "chrome/browser/chromeos/accessibility/accessibility_manager.h" |
8 #include "chrome/browser/chromeos/login/lock/screen_locker.h" | 8 #include "chrome/browser/chromeos/login/lock/screen_locker.h" |
9 #include "chrome/browser/chromeos/login/screens/chrome_user_selection_screen.h" | 9 #include "chrome/browser/chromeos/login/screens/chrome_user_selection_screen.h" |
10 #include "chrome/browser/chromeos/login/signin_screen_controller.h" | 10 #include "chrome/browser/chromeos/login/signin_screen_controller.h" |
(...skipping 209 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
220 DCHECK(delegate_); | 220 DCHECK(delegate_); |
221 if (delegate_) | 221 if (delegate_) |
222 delegate_->MigrateUserData(old_password); | 222 delegate_->MigrateUserData(old_password); |
223 } | 223 } |
224 | 224 |
225 void WebUILoginDisplay::LoadWallpaper(const AccountId& account_id) { | 225 void WebUILoginDisplay::LoadWallpaper(const AccountId& account_id) { |
226 WallpaperManager::Get()->SetUserWallpaperDelayed(account_id); | 226 WallpaperManager::Get()->SetUserWallpaperDelayed(account_id); |
227 } | 227 } |
228 | 228 |
229 void WebUILoginDisplay::LoadSigninWallpaper() { | 229 void WebUILoginDisplay::LoadSigninWallpaper() { |
230 WallpaperManager::Get()->SetDefaultWallpaperDelayed( | 230 if (!WallpaperManager::Get()->SetDeviceWallpaperIfApplicable( |
231 user_manager::SignInAccountId()); | 231 user_manager::SignInAccountId())) { |
| 232 WallpaperManager::Get()->SetDefaultWallpaperDelayed( |
| 233 user_manager::SignInAccountId()); |
| 234 } |
232 } | 235 } |
233 | 236 |
234 void WebUILoginDisplay::OnSigninScreenReady() { | 237 void WebUILoginDisplay::OnSigninScreenReady() { |
235 SignInScreenController::Get()->OnSigninScreenReady(); | 238 SignInScreenController::Get()->OnSigninScreenReady(); |
236 | 239 |
237 if (delegate_) | 240 if (delegate_) |
238 delegate_->OnSigninScreenReady(); | 241 delegate_->OnSigninScreenReady(); |
239 } | 242 } |
240 | 243 |
241 void WebUILoginDisplay::OnGaiaScreenReady() { | 244 void WebUILoginDisplay::OnGaiaScreenReady() { |
(...skipping 92 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
334 } | 337 } |
335 | 338 |
336 bool WebUILoginDisplay::IsUserWhitelisted(const AccountId& account_id) { | 339 bool WebUILoginDisplay::IsUserWhitelisted(const AccountId& account_id) { |
337 DCHECK(delegate_); | 340 DCHECK(delegate_); |
338 if (delegate_) | 341 if (delegate_) |
339 return delegate_->IsUserWhitelisted(account_id); | 342 return delegate_->IsUserWhitelisted(account_id); |
340 return true; | 343 return true; |
341 } | 344 } |
342 | 345 |
343 } // namespace chromeos | 346 } // namespace chromeos |
OLD | NEW |