| 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/app_launch_signin_screen.h" | 5 #include "chrome/browser/chromeos/login/app_launch_signin_screen.h" |
| 6 | 6 |
| 7 #include "base/values.h" | 7 #include "base/values.h" |
| 8 #include "chrome/browser/chromeos/login/help_app_launcher.h" | 8 #include "chrome/browser/chromeos/login/help_app_launcher.h" |
| 9 #include "chrome/browser/chromeos/login/login_utils.h" | |
| 10 #include "chrome/browser/chromeos/login/screens/user_selection_screen.h" | 9 #include "chrome/browser/chromeos/login/screens/user_selection_screen.h" |
| 10 #include "chrome/browser/chromeos/login/session/user_session_manager.h" |
| 11 #include "chrome/browser/signin/screenlock_bridge.h" | 11 #include "chrome/browser/signin/screenlock_bridge.h" |
| 12 #include "chrome/browser/ui/webui/chromeos/login/signin_screen_handler.h" | 12 #include "chrome/browser/ui/webui/chromeos/login/signin_screen_handler.h" |
| 13 #include "chrome/grit/generated_resources.h" | 13 #include "chrome/grit/generated_resources.h" |
| 14 #include "components/user_manager/user_manager.h" | 14 #include "components/user_manager/user_manager.h" |
| 15 #include "content/public/browser/browser_thread.h" | 15 #include "content/public/browser/browser_thread.h" |
| 16 #include "content/public/browser/web_ui.h" | 16 #include "content/public/browser/web_ui.h" |
| 17 #include "ui/base/l10n/l10n_util.h" | 17 #include "ui/base/l10n/l10n_util.h" |
| 18 | 18 |
| 19 namespace chromeos { | 19 namespace chromeos { |
| 20 | 20 |
| (...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 78 void AppLaunchSigninScreen::CreateAccount() { | 78 void AppLaunchSigninScreen::CreateAccount() { |
| 79 NOTREACHED(); | 79 NOTREACHED(); |
| 80 } | 80 } |
| 81 | 81 |
| 82 void AppLaunchSigninScreen::CompleteLogin(const UserContext& user_context) { | 82 void AppLaunchSigninScreen::CompleteLogin(const UserContext& user_context) { |
| 83 NOTREACHED(); | 83 NOTREACHED(); |
| 84 } | 84 } |
| 85 | 85 |
| 86 void AppLaunchSigninScreen::Login(const UserContext& user_context, | 86 void AppLaunchSigninScreen::Login(const UserContext& user_context, |
| 87 const SigninSpecifics& specifics) { | 87 const SigninSpecifics& specifics) { |
| 88 // Note: LoginUtils::CreateAuthenticator doesn't necessarily create | 88 // Note: CreateAuthenticator doesn't necessarily create |
| 89 // a new Authenticator object, and could reuse an existing one. | 89 // a new Authenticator object, and could reuse an existing one. |
| 90 authenticator_ = LoginUtils::Get()->CreateAuthenticator(this); | 90 authenticator_ = UserSessionManager::GetInstance()->CreateAuthenticator(this); |
| 91 content::BrowserThread::PostTask( | 91 content::BrowserThread::PostTask( |
| 92 content::BrowserThread::UI, FROM_HERE, | 92 content::BrowserThread::UI, FROM_HERE, |
| 93 base::Bind(&Authenticator::AuthenticateToUnlock, | 93 base::Bind(&Authenticator::AuthenticateToUnlock, |
| 94 authenticator_.get(), | 94 authenticator_.get(), |
| 95 user_context)); | 95 user_context)); |
| 96 } | 96 } |
| 97 | 97 |
| 98 void AppLaunchSigninScreen::MigrateUserData(const std::string& old_password) { | 98 void AppLaunchSigninScreen::MigrateUserData(const std::string& old_password) { |
| 99 NOTREACHED(); | 99 NOTREACHED(); |
| 100 } | 100 } |
| (...skipping 111 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 212 initial_auth_type, | 212 initial_auth_type, |
| 213 NULL, /* public_session_recommended_locales */ | 213 NULL, /* public_session_recommended_locales */ |
| 214 user_dict); | 214 user_dict); |
| 215 users_list.Append(user_dict); | 215 users_list.Append(user_dict); |
| 216 } | 216 } |
| 217 | 217 |
| 218 webui_handler_->LoadUsers(users_list, false); | 218 webui_handler_->LoadUsers(users_list, false); |
| 219 } | 219 } |
| 220 | 220 |
| 221 } // namespace chromeos | 221 } // namespace chromeos |
| OLD | NEW |