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

Side by Side Diff: chrome/browser/chromeos/login/supervised/supervised_user_login_flow.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/supervised/supervised_user_login_flow.h" 5 #include "chrome/browser/chromeos/login/supervised/supervised_user_login_flow.h"
6 6
7 #include "base/base64.h" 7 #include "base/base64.h"
8 #include "base/command_line.h" 8 #include "base/command_line.h"
9 #include "base/logging.h" 9 #include "base/logging.h"
10 #include "base/metrics/histogram.h" 10 #include "base/metrics/histogram.h"
11 #include "base/prefs/pref_registry_simple.h"
12 #include "base/prefs/pref_service.h"
13 #include "base/values.h" 11 #include "base/values.h"
14 #include "chrome/browser/chromeos/login/session/user_session_manager.h" 12 #include "chrome/browser/chromeos/login/session/user_session_manager.h"
15 #include "chrome/browser/chromeos/login/supervised/supervised_user_authenticatio n.h" 13 #include "chrome/browser/chromeos/login/supervised/supervised_user_authenticatio n.h"
16 #include "chrome/browser/chromeos/login/supervised/supervised_user_constants.h" 14 #include "chrome/browser/chromeos/login/supervised/supervised_user_constants.h"
17 #include "chrome/browser/chromeos/login/supervised/supervised_user_creation_scre en.h" 15 #include "chrome/browser/chromeos/login/supervised/supervised_user_creation_scre en.h"
18 #include "chrome/browser/chromeos/login/ui/login_display_host_impl.h" 16 #include "chrome/browser/chromeos/login/ui/login_display_host_impl.h"
19 #include "chrome/browser/chromeos/login/users/chrome_user_manager.h" 17 #include "chrome/browser/chromeos/login/users/chrome_user_manager.h"
20 #include "chrome/browser/chromeos/login/users/supervised_user_manager.h" 18 #include "chrome/browser/chromeos/login/users/supervised_user_manager.h"
21 #include "chrome/browser/chromeos/login/wizard_controller.h" 19 #include "chrome/browser/chromeos/login/wizard_controller.h"
22 #include "chrome/common/chrome_switches.h" 20 #include "chrome/common/chrome_switches.h"
23 #include "chromeos/login/auth/key.h" 21 #include "chromeos/login/auth/key.h"
22 #include "components/prefs/pref_registry_simple.h"
23 #include "components/prefs/pref_service.h"
24 #include "components/user_manager/user_manager.h" 24 #include "components/user_manager/user_manager.h"
25 #include "content/public/browser/browser_thread.h" 25 #include "content/public/browser/browser_thread.h"
26 26
27 using content::BrowserThread; 27 using content::BrowserThread;
28 28
29 namespace chromeos { 29 namespace chromeos {
30 30
31 SupervisedUserLoginFlow::SupervisedUserLoginFlow(const AccountId& account_id) 31 SupervisedUserLoginFlow::SupervisedUserLoginFlow(const AccountId& account_id)
32 : ExtendedUserFlow(account_id), weak_factory_(this) {} 32 : ExtendedUserFlow(account_id), weak_factory_(this) {}
33 33
(...skipping 223 matching lines...) Expand 10 before | Expand all | Expand 10 after
257 void SupervisedUserLoginFlow::LaunchExtraSteps( 257 void SupervisedUserLoginFlow::LaunchExtraSteps(
258 Profile* profile) { 258 Profile* profile) {
259 profile_ = profile; 259 profile_ = profile;
260 ChromeUserManager::Get()->GetSupervisedUserManager()->LoadSupervisedUserToken( 260 ChromeUserManager::Get()->GetSupervisedUserManager()->LoadSupervisedUserToken(
261 profile, 261 profile,
262 base::Bind(&SupervisedUserLoginFlow::OnSyncSetupDataLoaded, 262 base::Bind(&SupervisedUserLoginFlow::OnSyncSetupDataLoaded,
263 weak_factory_.GetWeakPtr())); 263 weak_factory_.GetWeakPtr()));
264 } 264 }
265 265
266 } // namespace chromeos 266 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/login/startup_utils.cc ('k') | chrome/browser/chromeos/login/ui/login_display_host_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698