Chromium Code Reviews| 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 "base/callback.h" | 7 #include "base/callback.h" |
| 8 #include "base/command_line.h" | 8 #include "base/command_line.h" |
| 9 #include "base/logging.h" | 9 #include "base/logging.h" |
| 10 #include "base/memory/scoped_ptr.h" | 10 #include "base/memory/scoped_ptr.h" |
| (...skipping 373 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 384 builder->Add("podMenuButtonAccessibleName", | 384 builder->Add("podMenuButtonAccessibleName", |
| 385 IDS_LOGIN_POD_MENU_BUTTON_ACCESSIBLE_NAME); | 385 IDS_LOGIN_POD_MENU_BUTTON_ACCESSIBLE_NAME); |
| 386 builder->Add("podMenuRemoveItemAccessibleName", | 386 builder->Add("podMenuRemoveItemAccessibleName", |
| 387 IDS_LOGIN_POD_MENU_REMOVE_ITEM_ACCESSIBLE_NAME); | 387 IDS_LOGIN_POD_MENU_REMOVE_ITEM_ACCESSIBLE_NAME); |
| 388 builder->Add("passwordFieldAccessibleName", | 388 builder->Add("passwordFieldAccessibleName", |
| 389 IDS_LOGIN_POD_PASSWORD_FIELD_ACCESSIBLE_NAME); | 389 IDS_LOGIN_POD_PASSWORD_FIELD_ACCESSIBLE_NAME); |
| 390 builder->Add("signedIn", IDS_SCREEN_LOCK_ACTIVE_USER); | 390 builder->Add("signedIn", IDS_SCREEN_LOCK_ACTIVE_USER); |
| 391 builder->Add("signinButton", IDS_LOGIN_BUTTON); | 391 builder->Add("signinButton", IDS_LOGIN_BUTTON); |
| 392 builder->Add("shutDown", IDS_SHUTDOWN_BUTTON); | 392 builder->Add("shutDown", IDS_SHUTDOWN_BUTTON); |
| 393 builder->Add("addUser", IDS_ADD_USER_BUTTON); | 393 builder->Add("addUser", IDS_ADD_USER_BUTTON); |
| 394 builder->Add("cancelUserAdding", IDS_CANCEL_USER_ADDING); | |
| 394 builder->Add("browseAsGuest", IDS_GO_INCOGNITO_BUTTON); | 395 builder->Add("browseAsGuest", IDS_GO_INCOGNITO_BUTTON); |
| 395 builder->Add("cancel", IDS_CANCEL); | 396 builder->Add("cancel", IDS_CANCEL); |
| 396 builder->Add("signOutUser", IDS_SCREEN_LOCK_SIGN_OUT); | 397 builder->Add("signOutUser", IDS_SCREEN_LOCK_SIGN_OUT); |
| 397 builder->Add("createAccount", IDS_CREATE_ACCOUNT_HTML); | 398 builder->Add("createAccount", IDS_CREATE_ACCOUNT_HTML); |
| 398 builder->Add("guestSignin", IDS_BROWSE_WITHOUT_SIGNING_IN_HTML); | 399 builder->Add("guestSignin", IDS_BROWSE_WITHOUT_SIGNING_IN_HTML); |
| 399 builder->Add("createLocallyManagedUser", | 400 builder->Add("createLocallyManagedUser", |
| 400 IDS_CREATE_LOCALLY_MANAGED_USER_HTML); | 401 IDS_CREATE_LOCALLY_MANAGED_USER_HTML); |
| 401 builder->Add("createManagedUserFeatureName", | 402 builder->Add("createManagedUserFeatureName", |
| 402 IDS_CREATE_LOCALLY_MANAGED_USER_FEATURE_NAME); | 403 IDS_CREATE_LOCALLY_MANAGED_USER_FEATURE_NAME); |
| 403 builder->Add("offlineLogin", IDS_OFFLINE_LOGIN_HTML); | 404 builder->Add("offlineLogin", IDS_OFFLINE_LOGIN_HTML); |
| (...skipping 383 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 787 AddCallback("demoWebuiReady", &SigninScreenHandler::HandleDemoWebuiReady); | 788 AddCallback("demoWebuiReady", &SigninScreenHandler::HandleDemoWebuiReady); |
| 788 AddCallback("signOutUser", &SigninScreenHandler::HandleSignOutUser); | 789 AddCallback("signOutUser", &SigninScreenHandler::HandleSignOutUser); |
| 789 AddCallback("userImagesLoaded", &SigninScreenHandler::HandleUserImagesLoaded); | 790 AddCallback("userImagesLoaded", &SigninScreenHandler::HandleUserImagesLoaded); |
| 790 AddCallback("networkErrorShown", | 791 AddCallback("networkErrorShown", |
| 791 &SigninScreenHandler::HandleNetworkErrorShown); | 792 &SigninScreenHandler::HandleNetworkErrorShown); |
| 792 AddCallback("openProxySettings", | 793 AddCallback("openProxySettings", |
| 793 &SigninScreenHandler::HandleOpenProxySettings); | 794 &SigninScreenHandler::HandleOpenProxySettings); |
| 794 AddCallback("loginVisible", &SigninScreenHandler::HandleLoginVisible); | 795 AddCallback("loginVisible", &SigninScreenHandler::HandleLoginVisible); |
| 795 AddCallback("cancelPasswordChangedFlow", | 796 AddCallback("cancelPasswordChangedFlow", |
| 796 &SigninScreenHandler::HandleCancelPasswordChangedFlow); | 797 &SigninScreenHandler::HandleCancelPasswordChangedFlow); |
| 798 AddCallback("cancelUserAdding", | |
| 799 &SigninScreenHandler::HandleCancelUserAdding); | |
| 797 AddCallback("migrateUserData", &SigninScreenHandler::HandleMigrateUserData); | 800 AddCallback("migrateUserData", &SigninScreenHandler::HandleMigrateUserData); |
| 798 AddCallback("resyncUserData", &SigninScreenHandler::HandleResyncUserData); | 801 AddCallback("resyncUserData", &SigninScreenHandler::HandleResyncUserData); |
| 799 AddCallback("loginUIStateChanged", | 802 AddCallback("loginUIStateChanged", |
| 800 &SigninScreenHandler::HandleLoginUIStateChanged); | 803 &SigninScreenHandler::HandleLoginUIStateChanged); |
| 801 AddCallback("unlockOnLoginSuccess", | 804 AddCallback("unlockOnLoginSuccess", |
| 802 &SigninScreenHandler::HandleUnlockOnLoginSuccess); | 805 &SigninScreenHandler::HandleUnlockOnLoginSuccess); |
| 803 AddCallback("frameLoadingCompleted", | 806 AddCallback("frameLoadingCompleted", |
| 804 &SigninScreenHandler::HandleFrameLoadingCompleted); | 807 &SigninScreenHandler::HandleFrameLoadingCompleted); |
| 805 AddCallback("showLoadingTimeoutError", | 808 AddCallback("showLoadingTimeoutError", |
| 806 &SigninScreenHandler::HandleShowLoadingTimeoutError); | 809 &SigninScreenHandler::HandleShowLoadingTimeoutError); |
| (...skipping 601 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1408 if (preferences_changed_delayed_) | 1411 if (preferences_changed_delayed_) |
| 1409 OnPreferencesChanged(); | 1412 OnPreferencesChanged(); |
| 1410 } | 1413 } |
| 1411 | 1414 |
| 1412 void SigninScreenHandler::HandleCancelPasswordChangedFlow() { | 1415 void SigninScreenHandler::HandleCancelPasswordChangedFlow() { |
| 1413 StartClearingCookies(base::Bind( | 1416 StartClearingCookies(base::Bind( |
| 1414 &SigninScreenHandler::CancelPasswordChangedFlowInternal, | 1417 &SigninScreenHandler::CancelPasswordChangedFlowInternal, |
| 1415 weak_factory_.GetWeakPtr())); | 1418 weak_factory_.GetWeakPtr())); |
| 1416 } | 1419 } |
| 1417 | 1420 |
| 1421 void SigninScreenHandler::HandleCancelUserAdding() { | |
| 1422 if (delegate_) { | |
|
Nikita (slow)
2013/05/28 11:34:22
nit: drop {}
dzhioev (left Google)
2013/05/29 13:05:04
Done.
| |
| 1423 delegate_->CancelUserAdding(); | |
| 1424 } | |
| 1425 } | |
| 1426 | |
| 1418 void SigninScreenHandler::HandleMigrateUserData( | 1427 void SigninScreenHandler::HandleMigrateUserData( |
| 1419 const std::string& old_password) { | 1428 const std::string& old_password) { |
| 1420 if (delegate_) | 1429 if (delegate_) |
| 1421 delegate_->MigrateUserData(old_password); | 1430 delegate_->MigrateUserData(old_password); |
| 1422 } | 1431 } |
| 1423 | 1432 |
| 1424 void SigninScreenHandler::HandleResyncUserData() { | 1433 void SigninScreenHandler::HandleResyncUserData() { |
| 1425 if (delegate_) | 1434 if (delegate_) |
| 1426 delegate_->ResyncUserData(); | 1435 delegate_->ResyncUserData(); |
| 1427 } | 1436 } |
| (...skipping 161 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1589 if (!cros_settings) | 1598 if (!cros_settings) |
| 1590 return false; | 1599 return false; |
| 1591 | 1600 |
| 1592 // Offline login is allowed only when user pods are hidden. | 1601 // Offline login is allowed only when user pods are hidden. |
| 1593 bool show_pods; | 1602 bool show_pods; |
| 1594 cros_settings->GetBoolean(kAccountsPrefShowUserNamesOnSignIn, &show_pods); | 1603 cros_settings->GetBoolean(kAccountsPrefShowUserNamesOnSignIn, &show_pods); |
| 1595 return !show_pods; | 1604 return !show_pods; |
| 1596 } | 1605 } |
| 1597 | 1606 |
| 1598 } // namespace chromeos | 1607 } // namespace chromeos |
| OLD | NEW |