From 484372884fa6236934471d00e84b23c26e1a22a7 Mon Sep 17 00:00:00 2001 From: "gspencer@google.com" Date: Fri, 10 Jun 2011 18:31:07 +0000 Subject: This swaps a flag so that it's always off to allow owner recovery Currently when the owner doesn't know their password, nothing short of a round-trip to dev land (re-imaging the machine) will get you ownership back again. This changes things so that you only have to log in and back out again. BUG=none TEST=none Review URL: http://codereview.chromium.org/7108027 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@88696 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome/browser/chromeos/login/existing_user_controller.cc | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'chrome') diff --git a/chrome/browser/chromeos/login/existing_user_controller.cc b/chrome/browser/chromeos/login/existing_user_controller.cc index 7b8a0be..cee4db0 100644 --- a/chrome/browser/chromeos/login/existing_user_controller.cc +++ b/chrome/browser/chromeos/login/existing_user_controller.cc @@ -401,12 +401,13 @@ void ExistingUserController::OnPasswordChangeDetected( // Another attempt will be invoked after verification completion. return; } - // TODO(altimofeev): remove this constrain when full sync for the owner will - // be correctly handled. - bool full_sync_disabled = (UserCrosSettingsProvider::cached_owner() == - last_login_attempt_username_); - PasswordChangedView* view = new PasswordChangedView(this, full_sync_disabled); + // Passing 'false' here enables "full sync" mode in the dialog, + // which disables the requirement for the old owner password, + // allowing us to recover from a lost owner password/homedir. + // TODO(gspencer): We shouldn't have to erase stateful data when + // doing this. See http://crosbug.com/9115 http://crosbug.com/7792 + PasswordChangedView* view = new PasswordChangedView(this, false); views::Window* window = browser::CreateViewsWindow(GetNativeWindow(), gfx::Rect(), view); -- cgit v1.1