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

Side by Side Diff: chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc

Issue 16002004: Added login screen mode for adding users into session. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: WebUI test fixed. Created 7 years, 6 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
OLDNEW
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 363 matching lines...) Expand 10 before | Expand all | Expand 10 after
374 builder->Add("podMenuButtonAccessibleName", 374 builder->Add("podMenuButtonAccessibleName",
375 IDS_LOGIN_POD_MENU_BUTTON_ACCESSIBLE_NAME); 375 IDS_LOGIN_POD_MENU_BUTTON_ACCESSIBLE_NAME);
376 builder->Add("podMenuRemoveItemAccessibleName", 376 builder->Add("podMenuRemoveItemAccessibleName",
377 IDS_LOGIN_POD_MENU_REMOVE_ITEM_ACCESSIBLE_NAME); 377 IDS_LOGIN_POD_MENU_REMOVE_ITEM_ACCESSIBLE_NAME);
378 builder->Add("passwordFieldAccessibleName", 378 builder->Add("passwordFieldAccessibleName",
379 IDS_LOGIN_POD_PASSWORD_FIELD_ACCESSIBLE_NAME); 379 IDS_LOGIN_POD_PASSWORD_FIELD_ACCESSIBLE_NAME);
380 builder->Add("signedIn", IDS_SCREEN_LOCK_ACTIVE_USER); 380 builder->Add("signedIn", IDS_SCREEN_LOCK_ACTIVE_USER);
381 builder->Add("signinButton", IDS_LOGIN_BUTTON); 381 builder->Add("signinButton", IDS_LOGIN_BUTTON);
382 builder->Add("shutDown", IDS_SHUTDOWN_BUTTON); 382 builder->Add("shutDown", IDS_SHUTDOWN_BUTTON);
383 builder->Add("addUser", IDS_ADD_USER_BUTTON); 383 builder->Add("addUser", IDS_ADD_USER_BUTTON);
384 builder->Add("cancelUserAdding", IDS_CANCEL_USER_ADDING);
384 builder->Add("browseAsGuest", IDS_GO_INCOGNITO_BUTTON); 385 builder->Add("browseAsGuest", IDS_GO_INCOGNITO_BUTTON);
385 builder->Add("cancel", IDS_CANCEL); 386 builder->Add("cancel", IDS_CANCEL);
386 builder->Add("signOutUser", IDS_SCREEN_LOCK_SIGN_OUT); 387 builder->Add("signOutUser", IDS_SCREEN_LOCK_SIGN_OUT);
387 builder->Add("createAccount", IDS_CREATE_ACCOUNT_HTML); 388 builder->Add("createAccount", IDS_CREATE_ACCOUNT_HTML);
388 builder->Add("guestSignin", IDS_BROWSE_WITHOUT_SIGNING_IN_HTML); 389 builder->Add("guestSignin", IDS_BROWSE_WITHOUT_SIGNING_IN_HTML);
389 builder->Add("createLocallyManagedUser", 390 builder->Add("createLocallyManagedUser",
390 IDS_CREATE_LOCALLY_MANAGED_USER_HTML); 391 IDS_CREATE_LOCALLY_MANAGED_USER_HTML);
391 builder->Add("createManagedUserFeatureName", 392 builder->Add("createManagedUserFeatureName",
392 IDS_CREATE_LOCALLY_MANAGED_USER_FEATURE_NAME); 393 IDS_CREATE_LOCALLY_MANAGED_USER_FEATURE_NAME);
393 builder->Add("createManagedUserNoManagerText", 394 builder->Add("createManagedUserNoManagerText",
(...skipping 385 matching lines...) Expand 10 before | Expand all | Expand 10 after
779 AddCallback("demoWebuiReady", &SigninScreenHandler::HandleDemoWebuiReady); 780 AddCallback("demoWebuiReady", &SigninScreenHandler::HandleDemoWebuiReady);
780 AddCallback("signOutUser", &SigninScreenHandler::HandleSignOutUser); 781 AddCallback("signOutUser", &SigninScreenHandler::HandleSignOutUser);
781 AddCallback("userImagesLoaded", &SigninScreenHandler::HandleUserImagesLoaded); 782 AddCallback("userImagesLoaded", &SigninScreenHandler::HandleUserImagesLoaded);
782 AddCallback("networkErrorShown", 783 AddCallback("networkErrorShown",
783 &SigninScreenHandler::HandleNetworkErrorShown); 784 &SigninScreenHandler::HandleNetworkErrorShown);
784 AddCallback("openProxySettings", 785 AddCallback("openProxySettings",
785 &SigninScreenHandler::HandleOpenProxySettings); 786 &SigninScreenHandler::HandleOpenProxySettings);
786 AddCallback("loginVisible", &SigninScreenHandler::HandleLoginVisible); 787 AddCallback("loginVisible", &SigninScreenHandler::HandleLoginVisible);
787 AddCallback("cancelPasswordChangedFlow", 788 AddCallback("cancelPasswordChangedFlow",
788 &SigninScreenHandler::HandleCancelPasswordChangedFlow); 789 &SigninScreenHandler::HandleCancelPasswordChangedFlow);
790 AddCallback("cancelUserAdding",
791 &SigninScreenHandler::HandleCancelUserAdding);
789 AddCallback("migrateUserData", &SigninScreenHandler::HandleMigrateUserData); 792 AddCallback("migrateUserData", &SigninScreenHandler::HandleMigrateUserData);
790 AddCallback("resyncUserData", &SigninScreenHandler::HandleResyncUserData); 793 AddCallback("resyncUserData", &SigninScreenHandler::HandleResyncUserData);
791 AddCallback("loginUIStateChanged", 794 AddCallback("loginUIStateChanged",
792 &SigninScreenHandler::HandleLoginUIStateChanged); 795 &SigninScreenHandler::HandleLoginUIStateChanged);
793 AddCallback("unlockOnLoginSuccess", 796 AddCallback("unlockOnLoginSuccess",
794 &SigninScreenHandler::HandleUnlockOnLoginSuccess); 797 &SigninScreenHandler::HandleUnlockOnLoginSuccess);
795 AddCallback("frameLoadingCompleted", 798 AddCallback("frameLoadingCompleted",
796 &SigninScreenHandler::HandleFrameLoadingCompleted); 799 &SigninScreenHandler::HandleFrameLoadingCompleted);
797 AddCallback("showLoadingTimeoutError", 800 AddCallback("showLoadingTimeoutError",
798 &SigninScreenHandler::HandleShowLoadingTimeoutError); 801 &SigninScreenHandler::HandleShowLoadingTimeoutError);
(...skipping 623 matching lines...) Expand 10 before | Expand all | Expand 10 after
1422 if (preferences_changed_delayed_) 1425 if (preferences_changed_delayed_)
1423 OnPreferencesChanged(); 1426 OnPreferencesChanged();
1424 } 1427 }
1425 1428
1426 void SigninScreenHandler::HandleCancelPasswordChangedFlow() { 1429 void SigninScreenHandler::HandleCancelPasswordChangedFlow() {
1427 StartClearingCookies(base::Bind( 1430 StartClearingCookies(base::Bind(
1428 &SigninScreenHandler::CancelPasswordChangedFlowInternal, 1431 &SigninScreenHandler::CancelPasswordChangedFlowInternal,
1429 weak_factory_.GetWeakPtr())); 1432 weak_factory_.GetWeakPtr()));
1430 } 1433 }
1431 1434
1435 void SigninScreenHandler::HandleCancelUserAdding() {
1436 if (delegate_)
1437 delegate_->CancelUserAdding();
1438 }
1439
1432 void SigninScreenHandler::HandleMigrateUserData( 1440 void SigninScreenHandler::HandleMigrateUserData(
1433 const std::string& old_password) { 1441 const std::string& old_password) {
1434 if (delegate_) 1442 if (delegate_)
1435 delegate_->MigrateUserData(old_password); 1443 delegate_->MigrateUserData(old_password);
1436 } 1444 }
1437 1445
1438 void SigninScreenHandler::HandleResyncUserData() { 1446 void SigninScreenHandler::HandleResyncUserData() {
1439 if (delegate_) 1447 if (delegate_)
1440 delegate_->ResyncUserData(); 1448 delegate_->ResyncUserData();
1441 } 1449 }
(...skipping 161 matching lines...) Expand 10 before | Expand all | Expand 10 after
1603 if (!cros_settings) 1611 if (!cros_settings)
1604 return false; 1612 return false;
1605 1613
1606 // Offline login is allowed only when user pods are hidden. 1614 // Offline login is allowed only when user pods are hidden.
1607 bool show_pods; 1615 bool show_pods;
1608 cros_settings->GetBoolean(kAccountsPrefShowUserNamesOnSignIn, &show_pods); 1616 cros_settings->GetBoolean(kAccountsPrefShowUserNamesOnSignIn, &show_pods);
1609 return !show_pods; 1617 return !show_pods;
1610 } 1618 }
1611 1619
1612 } // namespace chromeos 1620 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/ui/webui/chromeos/login/signin_screen_handler.h ('k') | chrome/chrome_browser_chromeos.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698