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

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

Issue 2452983002: ChromeOS: This CL moves chromeos/login/user_names* to user_mananger. (Closed)
Patch Set: Removed unused #includes Created 4 years, 1 month 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"
11 #include "chrome/browser/chromeos/login/startup_utils.h" 11 #include "chrome/browser/chromeos/login/startup_utils.h"
12 #include "chrome/browser/chromeos/login/ui/login_display_host.h" 12 #include "chrome/browser/chromeos/login/ui/login_display_host.h"
13 #include "chrome/browser/chromeos/login/ui/user_adding_screen.h" 13 #include "chrome/browser/chromeos/login/ui/user_adding_screen.h"
14 #include "chrome/browser/chromeos/login/ui/webui_login_view.h" 14 #include "chrome/browser/chromeos/login/ui/webui_login_view.h"
15 #include "chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager.h" 15 #include "chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager.h"
16 #include "chrome/browser/profiles/profile_manager.h" 16 #include "chrome/browser/profiles/profile_manager.h"
17 #include "chrome/browser/ui/browser_window.h" 17 #include "chrome/browser/ui/browser_window.h"
18 #include "chrome/grit/chromium_strings.h" 18 #include "chrome/grit/chromium_strings.h"
19 #include "chrome/grit/generated_resources.h" 19 #include "chrome/grit/generated_resources.h"
20 #include "chromeos/login/user_names.h"
21 #include "components/signin/core/account_id/account_id.h" 20 #include "components/signin/core/account_id/account_id.h"
22 #include "components/strings/grit/components_strings.h" 21 #include "components/strings/grit/components_strings.h"
23 #include "components/user_manager/user_manager.h" 22 #include "components/user_manager/user_manager.h"
23 #include "components/user_manager/user_names.h"
24 #include "ui/base/ime/chromeos/ime_keyboard.h" 24 #include "ui/base/ime/chromeos/ime_keyboard.h"
25 #include "ui/base/ime/chromeos/input_method_manager.h" 25 #include "ui/base/ime/chromeos/input_method_manager.h"
26 #include "ui/base/l10n/l10n_util.h" 26 #include "ui/base/l10n/l10n_util.h"
27 #include "ui/base/user_activity/user_activity_detector.h" 27 #include "ui/base/user_activity/user_activity_detector.h"
28 #include "ui/views/widget/widget.h" 28 #include "ui/views/widget/widget.h"
29 29
30 namespace chromeos { 30 namespace chromeos {
31 31
32 // WebUILoginDisplay, public: -------------------------------------------------- 32 // WebUILoginDisplay, public: --------------------------------------------------
33 33
(...skipping 186 matching lines...) Expand 10 before | Expand all | Expand 10 after
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(login::SignInAccountId()); 230 WallpaperManager::Get()->SetDefaultWallpaperDelayed(
231 user_manager::SignInAccountId());
231 } 232 }
232 233
233 void WebUILoginDisplay::OnSigninScreenReady() { 234 void WebUILoginDisplay::OnSigninScreenReady() {
234 SignInScreenController::Get()->OnSigninScreenReady(); 235 SignInScreenController::Get()->OnSigninScreenReady();
235 236
236 if (delegate_) 237 if (delegate_)
237 delegate_->OnSigninScreenReady(); 238 delegate_->OnSigninScreenReady();
238 } 239 }
239 240
240 void WebUILoginDisplay::RemoveUser(const AccountId& account_id) { 241 void WebUILoginDisplay::RemoveUser(const AccountId& account_id) {
(...skipping 87 matching lines...) Expand 10 before | Expand all | Expand 10 after
328 } 329 }
329 330
330 bool WebUILoginDisplay::IsUserWhitelisted(const AccountId& account_id) { 331 bool WebUILoginDisplay::IsUserWhitelisted(const AccountId& account_id) {
331 DCHECK(delegate_); 332 DCHECK(delegate_);
332 if (delegate_) 333 if (delegate_)
333 return delegate_->IsUserWhitelisted(account_id); 334 return delegate_->IsUserWhitelisted(account_id);
334 return true; 335 return true;
335 } 336 }
336 337
337 } // namespace chromeos 338 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698