OLD | NEW |
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_creation_cont
roller_new.h" | 5 #include "chrome/browser/chromeos/login/supervised/supervised_user_creation_cont
roller_new.h" |
6 | 6 |
7 #include "base/base64.h" | 7 #include "base/base64.h" |
8 #include "base/bind.h" | 8 #include "base/bind.h" |
9 #include "base/files/file_path.h" | 9 #include "base/files/file_path.h" |
10 #include "base/files/file_util.h" | 10 #include "base/files/file_util.h" |
11 #include "base/strings/string_number_conversions.h" | 11 #include "base/strings/string_number_conversions.h" |
12 #include "base/strings/string_util.h" | 12 #include "base/strings/string_util.h" |
13 #include "base/sys_info.h" | 13 #include "base/sys_info.h" |
14 #include "base/task_runner_util.h" | 14 #include "base/task_runner_util.h" |
15 #include "base/threading/sequenced_worker_pool.h" | 15 #include "base/threading/sequenced_worker_pool.h" |
16 #include "base/values.h" | 16 #include "base/values.h" |
17 #include "chrome/browser/chromeos/login/supervised/supervised_user_authenticatio
n.h" | 17 #include "chrome/browser/chromeos/login/supervised/supervised_user_authenticatio
n.h" |
18 #include "chrome/browser/chromeos/login/supervised/supervised_user_constants.h" | 18 #include "chrome/browser/chromeos/login/supervised/supervised_user_constants.h" |
19 #include "chrome/browser/chromeos/login/users/chrome_user_manager.h" | 19 #include "chrome/browser/chromeos/login/users/chrome_user_manager.h" |
20 #include "chrome/browser/chromeos/login/users/supervised_user_manager.h" | 20 #include "chrome/browser/chromeos/login/users/supervised_user_manager.h" |
21 #include "chrome/browser/chromeos/profiles/profile_helper.h" | 21 #include "chrome/browser/chromeos/profiles/profile_helper.h" |
22 #include "chrome/browser/lifetime/application_lifetime.h" | 22 #include "chrome/browser/lifetime/application_lifetime.h" |
23 #include "chrome/browser/sync/profile_sync_service.h" | |
24 #include "chrome/browser/sync/profile_sync_service_factory.h" | 23 #include "chrome/browser/sync/profile_sync_service_factory.h" |
25 #include "chromeos/cryptohome/cryptohome_parameters.h" | 24 #include "chromeos/cryptohome/cryptohome_parameters.h" |
26 #include "chromeos/dbus/dbus_thread_manager.h" | 25 #include "chromeos/dbus/dbus_thread_manager.h" |
27 #include "chromeos/dbus/session_manager_client.h" | 26 #include "chromeos/dbus/session_manager_client.h" |
28 #include "chromeos/login/auth/key.h" | 27 #include "chromeos/login/auth/key.h" |
29 #include "chromeos/login/auth/user_context.h" | 28 #include "chromeos/login/auth/user_context.h" |
| 29 #include "components/browser_sync/browser/profile_sync_service.h" |
30 #include "components/signin/core/account_id/account_id.h" | 30 #include "components/signin/core/account_id/account_id.h" |
31 #include "components/user_manager/user.h" | 31 #include "components/user_manager/user.h" |
32 #include "components/user_manager/user_manager.h" | 32 #include "components/user_manager/user_manager.h" |
33 #include "content/public/browser/browser_thread.h" | 33 #include "content/public/browser/browser_thread.h" |
34 #include "content/public/browser/user_metrics.h" | 34 #include "content/public/browser/user_metrics.h" |
35 #include "crypto/random.h" | 35 #include "crypto/random.h" |
36 #include "google_apis/gaia/google_service_auth_error.h" | 36 #include "google_apis/gaia/google_service_auth_error.h" |
37 | 37 |
38 namespace chromeos { | 38 namespace chromeos { |
39 | 39 |
(...skipping 375 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
415 creation_context_->registration_utility.reset(); | 415 creation_context_->registration_utility.reset(); |
416 chrome::AttemptUserExit(); | 416 chrome::AttemptUserExit(); |
417 } | 417 } |
418 | 418 |
419 std::string SupervisedUserCreationControllerNew::GetSupervisedUserId() { | 419 std::string SupervisedUserCreationControllerNew::GetSupervisedUserId() { |
420 DCHECK(creation_context_); | 420 DCHECK(creation_context_); |
421 return creation_context_->local_user_id; | 421 return creation_context_->local_user_id; |
422 } | 422 } |
423 | 423 |
424 } // namespace chromeos | 424 } // namespace chromeos |
OLD | NEW |