| 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/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" | 10 #include "chrome/browser/chromeos/login/session/user_session_manager.h" |
| 11 #include "chrome/browser/signin/screenlock_bridge.h" | |
| 12 #include "chrome/browser/ui/webui/chromeos/login/signin_screen_handler.h" | 11 #include "chrome/browser/ui/webui/chromeos/login/signin_screen_handler.h" |
| 13 #include "chrome/grit/generated_resources.h" | 12 #include "chrome/grit/generated_resources.h" |
| 14 #include "chromeos/login/auth/user_context.h" | 13 #include "chromeos/login/auth/user_context.h" |
| 14 #include "components/proximity_auth/screenlock_bridge.h" |
| 15 #include "components/user_manager/user_manager.h" | 15 #include "components/user_manager/user_manager.h" |
| 16 #include "content/public/browser/browser_thread.h" | 16 #include "content/public/browser/browser_thread.h" |
| 17 #include "content/public/browser/web_ui.h" | 17 #include "content/public/browser/web_ui.h" |
| 18 #include "ui/base/l10n/l10n_util.h" | 18 #include "ui/base/l10n/l10n_util.h" |
| 19 | 19 |
| 20 namespace chromeos { | 20 namespace chromeos { |
| 21 | 21 |
| 22 user_manager::UserManager* AppLaunchSigninScreen::test_user_manager_ = NULL; | 22 user_manager::UserManager* AppLaunchSigninScreen::test_user_manager_ = NULL; |
| 23 | 23 |
| 24 AppLaunchSigninScreen::AppLaunchSigninScreen( | 24 AppLaunchSigninScreen::AppLaunchSigninScreen( |
| (...skipping 167 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 192 delegate_->OnOwnerSigninSuccess(); | 192 delegate_->OnOwnerSigninSuccess(); |
| 193 } | 193 } |
| 194 | 194 |
| 195 void AppLaunchSigninScreen::HandleGetUsers() { | 195 void AppLaunchSigninScreen::HandleGetUsers() { |
| 196 base::ListValue users_list; | 196 base::ListValue users_list; |
| 197 const user_manager::UserList& users = GetUsers(); | 197 const user_manager::UserList& users = GetUsers(); |
| 198 | 198 |
| 199 for (user_manager::UserList::const_iterator it = users.begin(); | 199 for (user_manager::UserList::const_iterator it = users.begin(); |
| 200 it != users.end(); | 200 it != users.end(); |
| 201 ++it) { | 201 ++it) { |
| 202 ScreenlockBridge::LockHandler::AuthType initial_auth_type = | 202 proximity_auth::ScreenlockBridge::LockHandler::AuthType initial_auth_type = |
| 203 UserSelectionScreen::ShouldForceOnlineSignIn(*it) | 203 UserSelectionScreen::ShouldForceOnlineSignIn(*it) |
| 204 ? ScreenlockBridge::LockHandler::ONLINE_SIGN_IN | 204 ? proximity_auth::ScreenlockBridge::LockHandler::ONLINE_SIGN_IN |
| 205 : ScreenlockBridge::LockHandler::OFFLINE_PASSWORD; | 205 : proximity_auth::ScreenlockBridge::LockHandler::OFFLINE_PASSWORD; |
| 206 base::DictionaryValue* user_dict = new base::DictionaryValue(); | 206 base::DictionaryValue* user_dict = new base::DictionaryValue(); |
| 207 UserSelectionScreen::FillUserDictionary( | 207 UserSelectionScreen::FillUserDictionary( |
| 208 *it, | 208 *it, |
| 209 true, /* is_owner */ | 209 true, /* is_owner */ |
| 210 false, /* is_signin_to_add */ | 210 false, /* is_signin_to_add */ |
| 211 initial_auth_type, | 211 initial_auth_type, |
| 212 NULL, /* public_session_recommended_locales */ | 212 NULL, /* public_session_recommended_locales */ |
| 213 user_dict); | 213 user_dict); |
| 214 users_list.Append(user_dict); | 214 users_list.Append(user_dict); |
| 215 } | 215 } |
| 216 | 216 |
| 217 webui_handler_->LoadUsers(users_list, false); | 217 webui_handler_->LoadUsers(users_list, false); |
| 218 } | 218 } |
| 219 | 219 |
| 220 void AppLaunchSigninScreen::CheckUserStatus(const std::string& user_id) { | 220 void AppLaunchSigninScreen::CheckUserStatus(const std::string& user_id) { |
| 221 } | 221 } |
| 222 | 222 |
| 223 } // namespace chromeos | 223 } // namespace chromeos |
| OLD | NEW |