diff options
17 files changed, 37 insertions, 161 deletions
diff --git a/chrome/browser/chromeos/login/existing_user_controller.cc b/chrome/browser/chromeos/login/existing_user_controller.cc index b059089..3d73d4a 100644 --- a/chrome/browser/chromeos/login/existing_user_controller.cc +++ b/chrome/browser/chromeos/login/existing_user_controller.cc @@ -335,29 +335,6 @@ void ExistingUserController::CreateAccount() { LoginAsGuest(); } -void ExistingUserController::CreateLocallyManagedUser( - const string16& display_name, - const std::string& password) { - // TODO(nkostylev): Check that policy allows creation of such account type. - if (display_name.empty()) - return; - - // Disable clicking on other windows. - StopPublicSessionAutoLoginTimer(); - login_display_->SetUIEnabled(false); - - LoginPerformer::Delegate* delegate = this; - if (login_performer_delegate_.get()) - delegate = login_performer_delegate_.get(); - // Only one instance of LoginPerformer should exist at a time. - login_performer_.reset(NULL); - login_performer_.reset(new LoginPerformer(delegate)); - is_login_in_progress_ = true; - login_performer_-> - CreateLocallyManagedUser(display_name, password); - // TODO(nkostylev): A11y message. -} - void ExistingUserController::CompleteLogin(const UserCredentials& credentials) { if (!host_) { // Complete login event was generated already from UI. Ignore notification. diff --git a/chrome/browser/chromeos/login/existing_user_controller.h b/chrome/browser/chromeos/login/existing_user_controller.h index 37bf433..98b212a 100644 --- a/chrome/browser/chromeos/login/existing_user_controller.h +++ b/chrome/browser/chromeos/login/existing_user_controller.h @@ -74,8 +74,6 @@ class ExistingUserController : public LoginDisplay::Delegate, // LoginDisplay::Delegate: implementation virtual void CancelPasswordChangedFlow() OVERRIDE; virtual void CreateAccount() OVERRIDE; - virtual void CreateLocallyManagedUser(const string16& display_name, - const std::string& password) OVERRIDE; virtual void CompleteLogin(const UserCredentials& credentials) OVERRIDE; virtual string16 GetConnectedNetworkName() OVERRIDE; virtual void Login(const UserCredentials& credentials) OVERRIDE; diff --git a/chrome/browser/chromeos/login/login_display.h b/chrome/browser/chromeos/login/login_display.h index 5579ccc..e17c537 100644 --- a/chrome/browser/chromeos/login/login_display.h +++ b/chrome/browser/chromeos/login/login_display.h @@ -37,10 +37,6 @@ class LoginDisplay : public RemoveUserDelegate { // Create new Google account. virtual void CreateAccount() = 0; - // Create a new locally managed user. - virtual void CreateLocallyManagedUser(const string16& display_name, - const std::string& password) = 0; - // Complete sign process with specified |credentials|. // Used for new users authenticated through an extension. virtual void CompleteLogin(const UserCredentials& credentials) = 0; diff --git a/chrome/browser/chromeos/login/login_performer.cc b/chrome/browser/chromeos/login/login_performer.cc index 3b80335..b417846 100644 --- a/chrome/browser/chromeos/login/login_performer.cc +++ b/chrome/browser/chromeos/login/login_performer.cc @@ -266,16 +266,6 @@ void LoginPerformer::PerformLogin(const UserCredentials& credentials, } } -void LoginPerformer::CreateLocallyManagedUser(const string16& display_name, - const std::string& password) { - std::string id = UserManager::Get()->GenerateUniqueLocallyManagedUserId(); - const User* user = UserManager::Get()-> - CreateLocallyManagedUserRecord(id, display_name); - LoginAsLocallyManagedUser(UserCredentials(user->email(), - password, - std::string())); // auth_code -} - void LoginPerformer::LoginAsLocallyManagedUser( const UserCredentials& credentials) { DCHECK_EQ(UserManager::kLocallyManagedUserDomain, diff --git a/chrome/browser/chromeos/login/login_performer.h b/chrome/browser/chromeos/login/login_performer.h index 973dba2..c616a3c 100644 --- a/chrome/browser/chromeos/login/login_performer.h +++ b/chrome/browser/chromeos/login/login_performer.h @@ -97,10 +97,6 @@ class LoginPerformer : public LoginStatusConsumer, void PerformLogin(const UserCredentials& credentials, AuthorizationMode auth_mode); - // Performs locally managed user creation and login. - void CreateLocallyManagedUser(const string16& display_name, - const std::string& password); - // Performs locally managed user login with a given |username| and |password|. // Managed user creation should be done with CreateLocallyManagedUser(). void LoginAsLocallyManagedUser(const UserCredentials& credentials); diff --git a/chrome/browser/chromeos/login/parallel_authenticator.cc b/chrome/browser/chromeos/login/parallel_authenticator.cc index 4cc2268..1350bdb 100644 --- a/chrome/browser/chromeos/login/parallel_authenticator.cc +++ b/chrome/browser/chromeos/login/parallel_authenticator.cc @@ -293,7 +293,7 @@ void ParallelAuthenticator::LoginAsLocallyManagedUser( false)); Mount(current_state_.get(), scoped_refptr<ParallelAuthenticator>(this), - cryptohome::CREATE_IF_MISSING); + cryptohome::MOUNT_FLAGS_NONE); } void ParallelAuthenticator::LoginRetailMode() { diff --git a/chrome/browser/chromeos/login/webui_login_display.cc b/chrome/browser/chromeos/login/webui_login_display.cc index db0e18c..2a478e2 100644 --- a/chrome/browser/chromeos/login/webui_login_display.cc +++ b/chrome/browser/chromeos/login/webui_login_display.cc @@ -261,13 +261,6 @@ void WebUILoginDisplay::MigrateUserData(const std::string& old_password) { delegate_->MigrateUserData(old_password); } -void WebUILoginDisplay::CreateLocallyManagedUser(const string16& display_name, - const std::string password) { - DCHECK(delegate_); - if (delegate_) - delegate_->CreateLocallyManagedUser(display_name, password); -} - void WebUILoginDisplay::LoadWallpaper(const std::string& username) { WallpaperManager::Get()->SetUserWallpaper(username); } diff --git a/chrome/browser/chromeos/login/webui_login_display.h b/chrome/browser/chromeos/login/webui_login_display.h index fda3cbd..e3f2a84 100644 --- a/chrome/browser/chromeos/login/webui_login_display.h +++ b/chrome/browser/chromeos/login/webui_login_display.h @@ -54,8 +54,6 @@ class WebUILoginDisplay : public LoginDisplay, // SigninScreenHandlerDelegate implementation: virtual void CancelPasswordChangedFlow() OVERRIDE; virtual void CreateAccount() OVERRIDE; - virtual void CreateLocallyManagedUser(const string16& display_name, - const std::string password) OVERRIDE; virtual void CompleteLogin(const UserCredentials& credentials) OVERRIDE; virtual void Login(const UserCredentials& credentials) OVERRIDE; virtual void LoginAsRetailModeUser() OVERRIDE; diff --git a/chrome/browser/chromeos/login/webui_screen_locker.cc b/chrome/browser/chromeos/login/webui_screen_locker.cc index c99bc5a..06d3456 100644 --- a/chrome/browser/chromeos/login/webui_screen_locker.cc +++ b/chrome/browser/chromeos/login/webui_screen_locker.cc @@ -192,11 +192,6 @@ void WebUIScreenLocker::CreateAccount() { NOTREACHED(); } -void WebUIScreenLocker::CreateLocallyManagedUser(const string16& display_name, - const std::string& password) { - NOTREACHED(); -} - void WebUIScreenLocker::CompleteLogin(const UserCredentials& credentials) { NOTREACHED(); } diff --git a/chrome/browser/chromeos/login/webui_screen_locker.h b/chrome/browser/chromeos/login/webui_screen_locker.h index a1c019e..031ca23 100644 --- a/chrome/browser/chromeos/login/webui_screen_locker.h +++ b/chrome/browser/chromeos/login/webui_screen_locker.h @@ -64,9 +64,6 @@ class WebUIScreenLocker : public WebUILoginView, // LoginDisplay::Delegate: implementation virtual void CancelPasswordChangedFlow() OVERRIDE; virtual void CreateAccount() OVERRIDE; - virtual void CreateLocallyManagedUser(const string16& display_name, - const std::string& password) OVERRIDE; - virtual void CompleteLogin(const UserCredentials& credentials) OVERRIDE; virtual string16 GetConnectedNetworkName() OVERRIDE; virtual void Login(const UserCredentials& credentials) OVERRIDE; diff --git a/chrome/browser/resources/chromeos/login/screen_locally_managed_user_creation.js b/chrome/browser/resources/chromeos/login/screen_locally_managed_user_creation.js index 5bb0d7b..38a9ce2 100644 --- a/chrome/browser/resources/chromeos/login/screen_locally_managed_user_creation.js +++ b/chrome/browser/resources/chromeos/login/screen_locally_managed_user_creation.js @@ -210,7 +210,6 @@ cr.define('login', function() { lastVerifiedName_: null, lastIncorrectUserName_: null, managerList_: null, - useManagerBasedCreationFlow_: false, /** @override */ decorate: function() { @@ -252,15 +251,10 @@ cr.define('login', function() { password2Field.addEventListener('keydown', function(e) { creationScreen.passwordErrorVisible = false; if (e.keyIdentifier == 'Enter') { - if (creationScreen.useManagerBasedCreationFlow_) { - if (passwordField.value.length > 0) { - if (creationScreen.managerList_.selectedPod_) - creationScreen.managerList_.selectedPod_.focusInput(); - creationScreen.updateContinueButton_(); - } - } else { - if (creationScreen.updateContinueButton_()) - creationScreen.validateInputAndStartFlow_(); + if (passwordField.value.length > 0) { + if (creationScreen.managerList_.selectedPod_) + creationScreen.managerList_.selectedPod_.focusInput(); + creationScreen.updateContinueButton_(); } e.stopPropagation(); } @@ -350,22 +344,17 @@ cr.define('login', function() { loadTimeData.getString('createManagedUserPasswordMismatchError')); return; } - if (!this.useManagerBasedCreationFlow_) { - this.disabled = true; - chrome.send('tryCreateLocallyManagedUser', [userName, firstPassword]); - } else { - var selectedPod = this.managerList_.selectedPod_; - if (null == selectedPod) - return; + var selectedPod = this.managerList_.selectedPod_; + if (null == selectedPod) + return; - var managerId = selectedPod.user.emailAddress; - var managerPassword = selectedPod.passwordElement.value; - this.disabled = true; - // TODO(antrim) : we might use some minimal password validation - // (e.g. non-empty etc.) here. - chrome.send('runLocallyManagedUserCreationFlow', - [userName, firstPassword, managerId, managerPassword]); - } + var managerId = selectedPod.user.emailAddress; + var managerPassword = selectedPod.passwordElement.value; + this.disabled = true; + // TODO(antrim) : we might use some minimal password validation + // (e.g. non-empty etc.) here. + chrome.send('runLocallyManagedUserCreationFlow', + [userName, firstPassword, managerId, managerPassword]); }, /** @@ -486,12 +475,10 @@ cr.define('login', function() { this.lastVerifiedName_ && (userName == this.lastVerifiedName_); - if (this.useManagerBasedCreationFlow_) { - var selectedPod = this.managerList_.selectedPod_; - canProceed = canProceed && - null != selectedPod && - selectedPod.passwordElement.value.length > 0; - } + var selectedPod = this.managerList_.selectedPod_; + canProceed = canProceed && + null != selectedPod && + selectedPod.passwordElement.value.length > 0; this.setButtonDisabledStatus('proceed', !canProceed); return canProceed; @@ -627,7 +614,6 @@ cr.define('login', function() { */ loadManagers: function(userList) { $('managed-user-creation-flow-managers-block').hidden = false; - this.useManagerBasedCreationFlow_ = true; this.managerList_.clearPods(); for (var i = 0; i < userList.length; ++i) this.managerList_.addPod(userList[i]); diff --git a/chrome/browser/ui/webui/chromeos/login/locally_managed_user_creation_screen_handler.cc b/chrome/browser/ui/webui/chromeos/login/locally_managed_user_creation_screen_handler.cc index d2fe2a9..52fd04f 100644 --- a/chrome/browser/ui/webui/chromeos/login/locally_managed_user_creation_screen_handler.cc +++ b/chrome/browser/ui/webui/chromeos/login/locally_managed_user_creation_screen_handler.cc @@ -6,14 +6,12 @@ #include <string> -#include "base/command_line.h" #include "base/values.h" #include "chrome/browser/chromeos/login/managed/locally_managed_user_creation_flow.h" #include "chrome/browser/chromeos/login/user_manager.h" #include "chrome/browser/chromeos/settings/cros_settings.h" #include "chrome/browser/ui/webui/chromeos/login/oobe_ui.h" #include "chrome/browser/ui/webui/chromeos/login/signin_screen_handler.h" -#include "chromeos/chromeos_switches.h" #include "google_apis/gaia/gaia_auth_util.h" #include "grit/generated_resources.h" #include "ui/base/l10n/l10n_util.h" @@ -117,10 +115,6 @@ void LocallyManagedUserCreationScreenHandler::RegisterMessages() { base::Bind(&LocallyManagedUserCreationScreenHandler:: HandleCheckLocallyManagedUserName, base::Unretained(this))); - web_ui()->RegisterMessageCallback("tryCreateLocallyManagedUser", - base::Bind(&LocallyManagedUserCreationScreenHandler:: - HandleTryCreateLocallyManagedUser, - base::Unretained(this))); web_ui()->RegisterMessageCallback("runLocallyManagedUserCreationFlow", base::Bind(&LocallyManagedUserCreationScreenHandler:: HandleRunLocallyManagedUserCreationFlow, @@ -130,28 +124,22 @@ void LocallyManagedUserCreationScreenHandler::RegisterMessages() { void LocallyManagedUserCreationScreenHandler::PrepareToShow() {} void LocallyManagedUserCreationScreenHandler::Show() { - const CommandLine* command_line = CommandLine::ForCurrentProcess(); - if (command_line->HasSwitch( - chromeos::switches::kEnableLocallyManagedUserUIExperiments)) { - scoped_ptr<DictionaryValue> data(new base::DictionaryValue()); - scoped_ptr<ListValue> users_list(new base::ListValue()); - const UserList& users = UserManager::Get()->GetUsers(); - std::string owner; - chromeos::CrosSettings::Get()->GetString(chromeos::kDeviceOwner, &owner); - - for (UserList::const_iterator it = users.begin(); it != users.end(); ++it) { - if ((*it)->GetType() != User::USER_TYPE_REGULAR) - continue; - bool is_owner = ((*it)->email() == owner); - DictionaryValue* user_dict = new DictionaryValue(); - SigninScreenHandler::FillUserDictionary(*it, is_owner, user_dict); - users_list->Append(user_dict); - } - data->Set("managers", users_list.release()); - ShowScreen(OobeUI::kScreenManagedUserCreationFlow, data.get()); - } else { - ShowScreen(OobeUI::kScreenManagedUserCreationFlow, NULL); + scoped_ptr<DictionaryValue> data(new base::DictionaryValue()); + scoped_ptr<ListValue> users_list(new base::ListValue()); + const UserList& users = UserManager::Get()->GetUsers(); + std::string owner; + chromeos::CrosSettings::Get()->GetString(chromeos::kDeviceOwner, &owner); + + for (UserList::const_iterator it = users.begin(); it != users.end(); ++it) { + if ((*it)->GetType() != User::USER_TYPE_REGULAR) + continue; + bool is_owner = ((*it)->email() == owner); + DictionaryValue* user_dict = new DictionaryValue(); + SigninScreenHandler::FillUserDictionary(*it, is_owner, user_dict); + users_list->Append(user_dict); } + data->Set("managers", users_list.release()); + ShowScreen(OobeUI::kScreenManagedUserCreationFlow, data.get()); } void LocallyManagedUserCreationScreenHandler::Hide() {} @@ -237,37 +225,6 @@ void LocallyManagedUserCreationScreenHandler::HandleCheckLocallyManagedUserName( } } -// TODO(antrim): Remove method once new managed-based flow is implemented. -void LocallyManagedUserCreationScreenHandler::HandleTryCreateLocallyManagedUser( - const base::ListValue* args) { - DCHECK(args && args->GetSize() == 2); - - string16 name; - std::string password; - if (!args->GetString(0, &name) || !args->GetString(1, &password)) { - NOTREACHED(); - return; - } - name = CollapseWhitespace(name, true); - if (NULL != UserManager::Get()->FindLocallyManagedUser(name)) { - web_ui()->CallJavascriptFunction( - "login.LocallyManagedUserCreationScreen.managedUserNameError", - base::StringValue(name), - base::StringValue(l10n_util::GetStringFUTF16( - IDS_CREATE_LOCALLY_MANAGED_USER_CREATE_USERNAME_ALREADY_EXISTS, - name))); - return; - } - // TODO(antrim): Any other password checks here? - if (password.length() == 0) { - web_ui()->CallJavascriptFunction( - "login.LocallyManagedUserCreationScreen.showPasswordError", - base::StringValue(l10n_util::GetStringUTF16( - IDS_CREATE_LOCALLY_MANAGED_USER_CREATE_PASSWORD_TOO_SHORT))); - return; - } -} - void LocallyManagedUserCreationScreenHandler:: HandleRunLocallyManagedUserCreationFlow(const base::ListValue* args) { if (!delegate_) diff --git a/chrome/browser/ui/webui/chromeos/login/locally_managed_user_creation_screen_handler.h b/chrome/browser/ui/webui/chromeos/login/locally_managed_user_creation_screen_handler.h index 456bb7f..ae7de90 100644 --- a/chrome/browser/ui/webui/chromeos/login/locally_managed_user_creation_screen_handler.h +++ b/chrome/browser/ui/webui/chromeos/login/locally_managed_user_creation_screen_handler.h @@ -73,7 +73,6 @@ class LocallyManagedUserCreationScreenHandler : public BaseScreenHandler { void HandleRetryLocalManagedUserCreation(const base::ListValue* args); void HandleCheckLocallyManagedUserName(const base::ListValue* args); - void HandleTryCreateLocallyManagedUser(const base::ListValue* args); void HandleRunLocallyManagedUserCreationFlow(const base::ListValue* args); Delegate* delegate_; diff --git a/chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc b/chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc index 9435f3e..4ddb115 100644 --- a/chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc +++ b/chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc @@ -1222,6 +1222,9 @@ void SigninScreenHandler::HandleLaunchIncognito(const base::ListValue* args) { void SigninScreenHandler::HandleShowLocallyManagedUserCreationScreen( const base::ListValue* args) { + const CommandLine* command_line = CommandLine::ForCurrentProcess(); + if (!command_line->HasSwitch(::switches::kEnableManagedUsers)) + return; BaseLoginDisplayHost::default_host()-> StartWizard(WizardController::kLocallyManagedUserCreationScreenName, NULL); diff --git a/chrome/browser/ui/webui/chromeos/login/signin_screen_handler.h b/chrome/browser/ui/webui/chromeos/login/signin_screen_handler.h index 1bf0e24..84ab546 100644 --- a/chrome/browser/ui/webui/chromeos/login/signin_screen_handler.h +++ b/chrome/browser/ui/webui/chromeos/login/signin_screen_handler.h @@ -96,10 +96,6 @@ class SigninScreenHandlerDelegate { // and migrate to new password. virtual void MigrateUserData(const std::string& old_password) = 0; - // Create a new locally managed user. - virtual void CreateLocallyManagedUser(const string16& display_name, - const std::string password) = 0; - // Load wallpaper for given |username|. virtual void LoadWallpaper(const std::string& username) = 0; diff --git a/chromeos/chromeos_switches.cc b/chromeos/chromeos_switches.cc index 49368b6..09e8736 100644 --- a/chromeos/chromeos_switches.cc +++ b/chromeos/chromeos_switches.cc @@ -19,10 +19,6 @@ const char kDisableStubEthernet[] = "disable-stub-ethernet"; // Enable experimental Bluetooth features. const char kEnableExperimentalBluetooth[] = "enable-experimental-bluetooth"; -// Enables experiments in locally managed user creation ui. -const char kEnableLocallyManagedUserUIExperiments[] = - "enable-locally-managed-users-ui-experiments"; - // Enables the new NetworkChangeNotifier using the NetworkStateHandler class. const char kEnableNewNetworkChangeNotifier[] = "enable-new-network-change-notifier"; diff --git a/chromeos/chromeos_switches.h b/chromeos/chromeos_switches.h index 8c85bb7..9869d65c 100644 --- a/chromeos/chromeos_switches.h +++ b/chromeos/chromeos_switches.h @@ -24,7 +24,6 @@ CHROMEOS_EXPORT extern const char kChromeOSReleaseBoard[]; CHROMEOS_EXPORT extern const char kDbusStub[]; CHROMEOS_EXPORT extern const char kDisableStubEthernet[]; CHROMEOS_EXPORT extern const char kEnableExperimentalBluetooth[]; -CHROMEOS_EXPORT extern const char kEnableLocallyManagedUserUIExperiments[]; CHROMEOS_EXPORT extern const char kEnableNewNetworkChangeNotifier[]; CHROMEOS_EXPORT extern const char kUseNewNetworkConfigurationHandlers[]; CHROMEOS_EXPORT extern const char kEnableScreensaverExtensions[]; |