Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(706)

Side by Side Diff: chrome/browser/chromeos/login/ui/webui_login_display.cc

Issue 1497973002: This CL replaces e-mail with AccountId in wallpaper manager code. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Update after review. Created 5 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 214 matching lines...) Expand 10 before | Expand all | Expand 10 after
225 if (delegate_) 225 if (delegate_)
226 delegate_->Login(user_context, specifics); 226 delegate_->Login(user_context, specifics);
227 } 227 }
228 228
229 void WebUILoginDisplay::MigrateUserData(const std::string& old_password) { 229 void WebUILoginDisplay::MigrateUserData(const std::string& old_password) {
230 DCHECK(delegate_); 230 DCHECK(delegate_);
231 if (delegate_) 231 if (delegate_)
232 delegate_->MigrateUserData(old_password); 232 delegate_->MigrateUserData(old_password);
233 } 233 }
234 234
235 void WebUILoginDisplay::LoadWallpaper(const std::string& username) { 235 void WebUILoginDisplay::LoadWallpaper(const AccountId& account_id) {
236 WallpaperManager::Get()->SetUserWallpaperDelayed(username); 236 WallpaperManager::Get()->SetUserWallpaperDelayed(account_id);
237 } 237 }
238 238
239 void WebUILoginDisplay::LoadSigninWallpaper() { 239 void WebUILoginDisplay::LoadSigninWallpaper() {
240 WallpaperManager::Get()->SetDefaultWallpaperDelayed( 240 WallpaperManager::Get()->SetDefaultWallpaperDelayed(login::SignInAccountId());
241 login::SignInAccountId().GetUserEmail());
242 } 241 }
243 242
244 void WebUILoginDisplay::OnSigninScreenReady() { 243 void WebUILoginDisplay::OnSigninScreenReady() {
245 SignInScreenController::Get()->OnSigninScreenReady(); 244 SignInScreenController::Get()->OnSigninScreenReady();
246 245
247 if (delegate_) 246 if (delegate_)
248 delegate_->OnSigninScreenReady(); 247 delegate_->OnSigninScreenReady();
249 } 248 }
250 249
251 void WebUILoginDisplay::RemoveUser(const AccountId& account_id) { 250 void WebUILoginDisplay::RemoveUser(const AccountId& account_id) {
(...skipping 75 matching lines...) Expand 10 before | Expand all | Expand 10 after
327 } 326 }
328 327
329 bool WebUILoginDisplay::IsUserWhitelisted(const std::string& user_id) { 328 bool WebUILoginDisplay::IsUserWhitelisted(const std::string& user_id) {
330 DCHECK(delegate_); 329 DCHECK(delegate_);
331 if (delegate_) 330 if (delegate_)
332 return delegate_->IsUserWhitelisted(user_id); 331 return delegate_->IsUserWhitelisted(user_id);
333 return true; 332 return true;
334 } 333 }
335 334
336 } // namespace chromeos 335 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698