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

Side by Side Diff: chrome/browser/ui/webui/chromeos/login/supervised_user_creation_screen_handler.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
OLDNEW
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 "chrome/browser/ui/webui/chromeos/login/supervised_user_creation_screen _handler.h" 5 #include "chrome/browser/ui/webui/chromeos/login/supervised_user_creation_screen _handler.h"
6 6
7 #include "ash/audio/sounds.h" 7 #include "ash/audio/sounds.h"
8 #include "base/strings/utf_string_conversions.h" 8 #include "base/strings/utf_string_conversions.h"
9 #include "base/values.h" 9 #include "base/values.h"
10 #include "chrome/browser/chromeos/login/screens/user_selection_screen.h" 10 #include "chrome/browser/chromeos/login/screens/user_selection_screen.h"
(...skipping 205 matching lines...) Expand 10 before | Expand all | Expand 10 after
216 for (user_manager::UserList::const_iterator it = users.begin(); 216 for (user_manager::UserList::const_iterator it = users.begin();
217 it != users.end(); 217 it != users.end();
218 ++it) { 218 ++it) {
219 if ((*it)->GetType() != user_manager::USER_TYPE_REGULAR) 219 if ((*it)->GetType() != user_manager::USER_TYPE_REGULAR)
220 continue; 220 continue;
221 bool is_owner = ((*it)->email() == owner); 221 bool is_owner = ((*it)->email() == owner);
222 base::DictionaryValue* user_dict = new base::DictionaryValue(); 222 base::DictionaryValue* user_dict = new base::DictionaryValue();
223 UserSelectionScreen::FillUserDictionary( 223 UserSelectionScreen::FillUserDictionary(
224 *it, 224 *it,
225 is_owner, 225 is_owner,
226 false /* is_signin_to_add */, 226 false, /* is_signin_to_add */
227 ScreenlockBridge::LockHandler::OFFLINE_PASSWORD, 227 ScreenlockBridge::LockHandler::OFFLINE_PASSWORD,
228 NULL, /* public_session_recommended_locales */
228 user_dict); 229 user_dict);
229 users_list->Append(user_dict); 230 users_list->Append(user_dict);
230 } 231 }
231 data->Set("managers", users_list.release()); 232 data->Set("managers", users_list.release());
232 ShowScreen(OobeUI::kScreenSupervisedUserCreationFlow, data.get()); 233 ShowScreen(OobeUI::kScreenSupervisedUserCreationFlow, data.get());
233 234
234 if (!delegate_) 235 if (!delegate_)
235 return; 236 return;
236 } 237 }
237 238
(...skipping 211 matching lines...) Expand 10 before | Expand all | Expand 10 after
449 void SupervisedUserCreationScreenHandler::SetCameraPresent(bool present) { 450 void SupervisedUserCreationScreenHandler::SetCameraPresent(bool present) {
450 CallJS("setCameraPresent", present); 451 CallJS("setCameraPresent", present);
451 } 452 }
452 453
453 void SupervisedUserCreationScreenHandler::ShowExistingSupervisedUsers( 454 void SupervisedUserCreationScreenHandler::ShowExistingSupervisedUsers(
454 const base::ListValue* users) { 455 const base::ListValue* users) {
455 CallJS("setExistingSupervisedUsers", *users); 456 CallJS("setExistingSupervisedUsers", *users);
456 } 457 }
457 458
458 } // namespace chromeos 459 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc ('k') | chrome/test/data/policy/policy_test_cases.json » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698