chrome/browser/chromeos/login/supervised/supervised_user_login_flow.cc - Issue 393343002: Rename "managed (mode|user)" to "supervised user" (part 7)

Side by Side Diff: chrome/browser/chromeos/login/supervised/supervised_user_login_flow.cc

Issue 393343002: Rename "managed (mode|user)" to "supervised user" (part 7) (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 6 years, 5 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 | Annotate | Revision Log

« chrome/browser/chromeos/login/screens/screen_factory.cc ('K') | « chrome/browser/chromeos/login/supervised/supervised_user_login_flow.h ('k') | chrome/browser/chromeos/login/supervised/supervised_user_password_browsertest.cc » ('j') | chrome/browser/chromeos/login/ui/oobe_display.h » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
1 // Copyright 2013 The Chromium Authors. All rights reserved.	1 // Copyright 2013 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/managed/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/logging.h"	8 #include "base/logging.h"

9 #include "base/metrics/histogram.h"	9 #include "base/metrics/histogram.h"

10 #include "base/prefs/pref_registry_simple.h"	10 #include "base/prefs/pref_registry_simple.h"

11 #include "base/prefs/pref_service.h"	11 #include "base/prefs/pref_service.h"

12 #include "base/values.h"	12 #include "base/values.h"

13 #include "chrome/browser/chromeos/login/login_utils.h"	13 #include "chrome/browser/chromeos/login/login_utils.h"

14 #include "chrome/browser/chromeos/login/managed/locally_managed_user_constants.h "	14 #include "chrome/browser/chromeos/login/supervised/supervised_user_authenticatio n.h"

15 #include "chrome/browser/chromeos/login/managed/locally_managed_user_creation_sc reen.h"	15 #include "chrome/browser/chromeos/login/supervised/supervised_user_constants.h"

16 #include "chrome/browser/chromeos/login/managed/supervised_user_authentication.h "	16 #include "chrome/browser/chromeos/login/supervised/supervised_user_creation_scre en.h"

17 #include "chrome/browser/chromeos/login/ui/login_display_host_impl.h"	17 #include "chrome/browser/chromeos/login/ui/login_display_host_impl.h"

18 #include "chrome/browser/chromeos/login/users/supervised_user_manager.h"	18 #include "chrome/browser/chromeos/login/users/supervised_user_manager.h"

19 #include "chrome/browser/chromeos/login/users/user_manager.h"	19 #include "chrome/browser/chromeos/login/users/user_manager.h"

20 #include "chrome/browser/chromeos/login/wizard_controller.h"	20 #include "chrome/browser/chromeos/login/wizard_controller.h"

21 #include "chromeos/login/auth/key.h"	21 #include "chromeos/login/auth/key.h"

22 #include "content/public/browser/browser_thread.h"	22 #include "content/public/browser/browser_thread.h"

23	23

24 using content::BrowserThread;	24 using content::BrowserThread;

25	25

26 namespace chromeos {	26 namespace chromeos {

(...skipping 222 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
249 Profile* profile) {	249 Profile* profile) {

250 profile_ = profile;	250 profile_ = profile;

251 UserManager::Get()->GetSupervisedUserManager()->LoadSupervisedUserToken(	251 UserManager::Get()->GetSupervisedUserManager()->LoadSupervisedUserToken(

252 profile,	252 profile,

253 base::Bind(	253 base::Bind(

254 &SupervisedUserLoginFlow::OnSyncSetupDataLoaded,	254 &SupervisedUserLoginFlow::OnSyncSetupDataLoaded,

255 weak_factory_.GetWeakPtr()));	255 weak_factory_.GetWeakPtr()));

256 }	256 }

257	257

258 } // namespace chromeos	258 } // namespace chromeos

OLD	NEW