Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(142)

Side by Side Diff: chrome/browser/chromeos/login/app_launch_signin_screen.cc

Issue 426063005: Allow recommended locales to be set for public sessions (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix buffer overflow in test. Created 6 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | chrome/browser/chromeos/login/existing_user_controller.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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
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,
204 true, /* is_owner */
205 false, /* is_signin_to_add */
206 initial_auth_type,
207 NULL, /* public_session_recommended_locales */
208 user_dict);
204 users_list.Append(user_dict); 209 users_list.Append(user_dict);
205 } 210 }
206 211
207 webui_handler_->LoadUsers(users_list, false); 212 webui_handler_->LoadUsers(users_list, false);
208 } 213 }
209 214
210 void AppLaunchSigninScreen::SetAuthType( 215 void AppLaunchSigninScreen::SetAuthType(
211 const std::string& username, 216 const std::string& username,
212 ScreenlockBridge::LockHandler::AuthType auth_type) { 217 ScreenlockBridge::LockHandler::AuthType auth_type) {
213 return; 218 return;
214 } 219 }
215 220
216 ScreenlockBridge::LockHandler::AuthType AppLaunchSigninScreen::GetAuthType( 221 ScreenlockBridge::LockHandler::AuthType AppLaunchSigninScreen::GetAuthType(
217 const std::string& username) const { 222 const std::string& username) const {
218 return ScreenlockBridge::LockHandler::OFFLINE_PASSWORD; 223 return ScreenlockBridge::LockHandler::OFFLINE_PASSWORD;
219 } 224 }
220 225
221 } // namespace chromeos 226 } // namespace chromeos
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/chromeos/login/existing_user_controller.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698