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 "chromeos/login/auth/login_performer.h" | 5 #include "chromeos/login/auth/login_performer.h" |
6 | 6 |
7 #include "base/bind.h" | 7 #include "base/bind.h" |
8 #include "base/location.h" | 8 #include "base/location.h" |
9 #include "base/logging.h" | 9 #include "base/logging.h" |
10 #include "base/metrics/histogram_macros.h" | 10 #include "base/metrics/histogram_macros.h" |
11 #include "base/metrics/user_metrics.h" | 11 #include "base/metrics/user_metrics.h" |
12 #include "base/metrics/user_metrics_action.h" | 12 #include "base/metrics/user_metrics_action.h" |
13 #include "base/single_thread_task_runner.h" | 13 #include "base/single_thread_task_runner.h" |
14 #include "base/strings/utf_string_conversions.h" | 14 #include "base/strings/utf_string_conversions.h" |
15 #include "base/threading/thread_restrictions.h" | 15 #include "base/threading/thread_restrictions.h" |
16 #include "base/threading/thread_task_runner_handle.h" | 16 #include "base/threading/thread_task_runner_handle.h" |
17 #include "chromeos/dbus/dbus_thread_manager.h" | 17 #include "chromeos/dbus/dbus_thread_manager.h" |
18 #include "chromeos/dbus/session_manager_client.h" | 18 #include "chromeos/dbus/session_manager_client.h" |
19 #include "chromeos/login/user_names.h" | |
20 #include "chromeos/login_event_recorder.h" | 19 #include "chromeos/login_event_recorder.h" |
21 #include "chromeos/settings/cros_settings_names.h" | 20 #include "chromeos/settings/cros_settings_names.h" |
22 #include "components/prefs/pref_service.h" | 21 #include "components/prefs/pref_service.h" |
23 #include "components/signin/core/account_id/account_id.h" | 22 #include "components/signin/core/account_id/account_id.h" |
| 23 #include "components/user_manager/user_names.h" |
24 #include "google_apis/gaia/gaia_auth_util.h" | 24 #include "google_apis/gaia/gaia_auth_util.h" |
25 #include "net/cookies/cookie_monster.h" | 25 #include "net/cookies/cookie_monster.h" |
26 #include "net/cookies/cookie_store.h" | 26 #include "net/cookies/cookie_store.h" |
27 #include "net/url_request/url_request_context.h" | 27 #include "net/url_request/url_request_context.h" |
28 #include "net/url_request/url_request_context_getter.h" | 28 #include "net/url_request/url_request_context_getter.h" |
29 | 29 |
30 using base::UserMetricsAction; | 30 using base::UserMetricsAction; |
31 | 31 |
32 namespace chromeos { | 32 namespace chromeos { |
33 | 33 |
(...skipping 122 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
156 break; | 156 break; |
157 } | 157 } |
158 case AUTH_MODE_INTERNAL: | 158 case AUTH_MODE_INTERNAL: |
159 StartAuthentication(); | 159 StartAuthentication(); |
160 break; | 160 break; |
161 } | 161 } |
162 } | 162 } |
163 | 163 |
164 void LoginPerformer::LoginAsSupervisedUser(const UserContext& user_context) { | 164 void LoginPerformer::LoginAsSupervisedUser(const UserContext& user_context) { |
165 DCHECK_EQ( | 165 DCHECK_EQ( |
166 chromeos::login::kSupervisedUserDomain, | 166 user_manager::kSupervisedUserDomain, |
167 gaia::ExtractDomainName(user_context.GetAccountId().GetUserEmail())); | 167 gaia::ExtractDomainName(user_context.GetAccountId().GetUserEmail())); |
168 | 168 |
169 user_context_ = user_context; | 169 user_context_ = user_context; |
170 user_context_.SetUserType(user_manager::USER_TYPE_SUPERVISED); | 170 user_context_.SetUserType(user_manager::USER_TYPE_SUPERVISED); |
171 | 171 |
172 if (RunTrustedCheck(base::Bind(&LoginPerformer::TrustedLoginAsSupervisedUser, | 172 if (RunTrustedCheck(base::Bind(&LoginPerformer::TrustedLoginAsSupervisedUser, |
173 weak_factory_.GetWeakPtr(), | 173 weak_factory_.GetWeakPtr(), |
174 user_context_))) { | 174 user_context_))) { |
175 return; | 175 return; |
176 } | 176 } |
(...skipping 111 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
288 } else { | 288 } else { |
289 NOTREACHED(); | 289 NOTREACHED(); |
290 } | 290 } |
291 user_context_.ClearSecrets(); | 291 user_context_.ClearSecrets(); |
292 } | 292 } |
293 | 293 |
294 void LoginPerformer::EnsureAuthenticator() { | 294 void LoginPerformer::EnsureAuthenticator() { |
295 authenticator_ = CreateAuthenticator(); | 295 authenticator_ = CreateAuthenticator(); |
296 } | 296 } |
297 } // namespace chromeos | 297 } // namespace chromeos |
OLD | NEW |