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

Side by Side Diff: chrome/browser/chromeos/login/screens/user_selection_screen.cc

Issue 1658793002: Update chrome for new prefs location. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 10 months 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/screens/user_selection_screen.h" 5 #include "chrome/browser/chromeos/login/screens/user_selection_screen.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 8
9 #include "base/location.h" 9 #include "base/location.h"
10 #include "base/logging.h" 10 #include "base/logging.h"
11 #include "base/prefs/pref_service.h"
12 #include "base/values.h" 11 #include "base/values.h"
13 #include "chrome/browser/browser_process.h" 12 #include "chrome/browser/browser_process.h"
14 #include "chrome/browser/browser_process_platform_part.h" 13 #include "chrome/browser/browser_process_platform_part.h"
15 #include "chrome/browser/chromeos/login/lock/screen_locker.h" 14 #include "chrome/browser/chromeos/login/lock/screen_locker.h"
16 #include "chrome/browser/chromeos/login/reauth_stats.h" 15 #include "chrome/browser/chromeos/login/reauth_stats.h"
17 #include "chrome/browser/chromeos/login/ui/login_display_host.h" 16 #include "chrome/browser/chromeos/login/ui/login_display_host.h"
18 #include "chrome/browser/chromeos/login/ui/views/user_board_view.h" 17 #include "chrome/browser/chromeos/login/ui/views/user_board_view.h"
19 #include "chrome/browser/chromeos/login/users/chrome_user_manager.h" 18 #include "chrome/browser/chromeos/login/users/chrome_user_manager.h"
20 #include "chrome/browser/chromeos/login/users/multi_profile_user_controller.h" 19 #include "chrome/browser/chromeos/login/users/multi_profile_user_controller.h"
21 #include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h" 20 #include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h"
22 #include "chrome/browser/chromeos/profiles/profile_helper.h" 21 #include "chrome/browser/chromeos/profiles/profile_helper.h"
23 #include "chrome/browser/signin/easy_unlock_service.h" 22 #include "chrome/browser/signin/easy_unlock_service.h"
24 #include "chrome/browser/ui/webui/chromeos/login/l10n_util.h" 23 #include "chrome/browser/ui/webui/chromeos/login/l10n_util.h"
25 #include "chrome/browser/ui/webui/chromeos/login/signin_screen_handler.h" 24 #include "chrome/browser/ui/webui/chromeos/login/signin_screen_handler.h"
25 #include "components/prefs/pref_service.h"
26 #include "components/proximity_auth/screenlock_bridge.h" 26 #include "components/proximity_auth/screenlock_bridge.h"
27 #include "components/signin/core/account_id/account_id.h" 27 #include "components/signin/core/account_id/account_id.h"
28 #include "components/user_manager/known_user.h" 28 #include "components/user_manager/known_user.h"
29 #include "components/user_manager/user_manager.h" 29 #include "components/user_manager/user_manager.h"
30 #include "components/user_manager/user_type.h" 30 #include "components/user_manager/user_type.h"
31 #include "ui/base/user_activity/user_activity_detector.h" 31 #include "ui/base/user_activity/user_activity_detector.h"
32 32
33 namespace chromeos { 33 namespace chromeos {
34 34
35 namespace { 35 namespace {
(...skipping 516 matching lines...) Expand 10 before | Expand all | Expand 10 after
552 // The user profile should exist if and only if this is the lock screen. 552 // The user profile should exist if and only if this is the lock screen.
553 DCHECK_EQ(!!profile, GetScreenType() == LOCK_SCREEN); 553 DCHECK_EQ(!!profile, GetScreenType() == LOCK_SCREEN);
554 554
555 if (!profile) 555 if (!profile)
556 profile = profile_helper->GetSigninProfile(); 556 profile = profile_helper->GetSigninProfile();
557 557
558 return EasyUnlockService::Get(profile); 558 return EasyUnlockService::Get(profile);
559 } 559 }
560 560
561 } // namespace chromeos 561 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698