OLD | NEW |
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 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/ui/webui/chromeos/login/signin_screen_handler.h" | 5 #include "chrome/browser/ui/webui/chromeos/login/signin_screen_handler.h" |
6 | 6 |
7 #include <stddef.h> | 7 #include <stddef.h> |
8 | 8 |
9 #include <algorithm> | 9 #include <algorithm> |
10 #include <vector> | 10 #include <vector> |
(...skipping 1258 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1269 const std::string& locale) { | 1269 const std::string& locale) { |
1270 GetKeyboardLayoutsForLocale( | 1270 GetKeyboardLayoutsForLocale( |
1271 base::Bind(&SigninScreenHandler::SendPublicSessionKeyboardLayouts, | 1271 base::Bind(&SigninScreenHandler::SendPublicSessionKeyboardLayouts, |
1272 weak_factory_.GetWeakPtr(), account_id, locale), | 1272 weak_factory_.GetWeakPtr(), account_id, locale), |
1273 locale); | 1273 locale); |
1274 } | 1274 } |
1275 | 1275 |
1276 void SigninScreenHandler::SendPublicSessionKeyboardLayouts( | 1276 void SigninScreenHandler::SendPublicSessionKeyboardLayouts( |
1277 const AccountId& account_id, | 1277 const AccountId& account_id, |
1278 const std::string& locale, | 1278 const std::string& locale, |
1279 scoped_ptr<base::ListValue> keyboard_layouts) { | 1279 std::unique_ptr<base::ListValue> keyboard_layouts) { |
1280 CallJS("login.AccountPickerScreen.setPublicSessionKeyboardLayouts", | 1280 CallJS("login.AccountPickerScreen.setPublicSessionKeyboardLayouts", |
1281 account_id, locale, *keyboard_layouts); | 1281 account_id, locale, *keyboard_layouts); |
1282 } | 1282 } |
1283 | 1283 |
1284 void SigninScreenHandler::HandleLaunchKioskApp(const AccountId& app_account_id, | 1284 void SigninScreenHandler::HandleLaunchKioskApp(const AccountId& app_account_id, |
1285 bool diagnostic_mode) { | 1285 bool diagnostic_mode) { |
1286 UserContext context(user_manager::USER_TYPE_KIOSK_APP, app_account_id); | 1286 UserContext context(user_manager::USER_TYPE_KIOSK_APP, app_account_id); |
1287 SigninSpecifics specifics; | 1287 SigninSpecifics specifics; |
1288 specifics.kiosk_diagnostic_mode = diagnostic_mode; | 1288 specifics.kiosk_diagnostic_mode = diagnostic_mode; |
1289 if (delegate_) | 1289 if (delegate_) |
(...skipping 126 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1416 } | 1416 } |
1417 | 1417 |
1418 void SigninScreenHandler::OnFeedbackFinished() { | 1418 void SigninScreenHandler::OnFeedbackFinished() { |
1419 CallJS("login.UnrecoverableCryptohomeErrorScreen.resumeAfterFeedbackUI"); | 1419 CallJS("login.UnrecoverableCryptohomeErrorScreen.resumeAfterFeedbackUI"); |
1420 | 1420 |
1421 // Recreate user's cryptohome after the feedkback is attempted. | 1421 // Recreate user's cryptohome after the feedkback is attempted. |
1422 HandleResyncUserData(); | 1422 HandleResyncUserData(); |
1423 } | 1423 } |
1424 | 1424 |
1425 } // namespace chromeos | 1425 } // namespace chromeos |
OLD | NEW |