Chromium Code Reviews| 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" | 9 #include "chrome/browser/chromeos/login/login_utils.h" |
| 10 #include "chrome/browser/chromeos/login/screens/user_selection_screen.h" | 10 #include "chrome/browser/chromeos/login/screens/user_selection_screen.h" |
| (...skipping 182 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 193 | 193 |
| 194 for (user_manager::UserList::const_iterator it = users.begin(); | 194 for (user_manager::UserList::const_iterator it = users.begin(); |
| 195 it != users.end(); | 195 it != users.end(); |
| 196 ++it) { | 196 ++it) { |
| 197 ScreenlockBridge::LockHandler::AuthType initial_auth_type = | 197 ScreenlockBridge::LockHandler::AuthType initial_auth_type = |
| 198 UserSelectionScreen::ShouldForceOnlineSignIn(*it) | 198 UserSelectionScreen::ShouldForceOnlineSignIn(*it) |
| 199 ? ScreenlockBridge::LockHandler::ONLINE_SIGN_IN | 199 ? ScreenlockBridge::LockHandler::ONLINE_SIGN_IN |
| 200 : ScreenlockBridge::LockHandler::OFFLINE_PASSWORD; | 200 : ScreenlockBridge::LockHandler::OFFLINE_PASSWORD; |
| 201 base::DictionaryValue* user_dict = new base::DictionaryValue(); | 201 base::DictionaryValue* user_dict = new base::DictionaryValue(); |
| 202 UserSelectionScreen::FillUserDictionary( | 202 UserSelectionScreen::FillUserDictionary( |
| 203 *it, true, false, initial_auth_type, user_dict); | 203 *it, true, false, initial_auth_type, NULL, user_dict); |
|
Nikita (slow)
2014/07/30 11:22:59
nit: /* public_session_recommended_locales */
bartfab (slow)
2014/08/05 17:16:23
Done.
| |
| 204 users_list.Append(user_dict); | 204 users_list.Append(user_dict); |
| 205 } | 205 } |
| 206 | 206 |
| 207 webui_handler_->LoadUsers(users_list, false); | 207 webui_handler_->LoadUsers(users_list, false); |
| 208 } | 208 } |
| 209 | 209 |
| 210 void AppLaunchSigninScreen::SetAuthType( | 210 void AppLaunchSigninScreen::SetAuthType( |
| 211 const std::string& username, | 211 const std::string& username, |
| 212 ScreenlockBridge::LockHandler::AuthType auth_type) { | 212 ScreenlockBridge::LockHandler::AuthType auth_type) { |
| 213 return; | 213 return; |
| 214 } | 214 } |
| 215 | 215 |
| 216 ScreenlockBridge::LockHandler::AuthType AppLaunchSigninScreen::GetAuthType( | 216 ScreenlockBridge::LockHandler::AuthType AppLaunchSigninScreen::GetAuthType( |
| 217 const std::string& username) const { | 217 const std::string& username) const { |
| 218 return ScreenlockBridge::LockHandler::OFFLINE_PASSWORD; | 218 return ScreenlockBridge::LockHandler::OFFLINE_PASSWORD; |
| 219 } | 219 } |
| 220 | 220 |
| 221 } // namespace chromeos | 221 } // namespace chromeos |
| OLD | NEW |