summaryrefslogtreecommitdiffstats
path: root/chrome/browser/sync/profile_sync_service.cc
diff options
context:
space:
mode:
authortim@chromium.org <tim@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-11-12 21:22:09 +0000
committertim@chromium.org <tim@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-11-12 21:22:09 +0000
commit1fc9b3ffe78b02bcb819fefa2b0884a1e31d060b (patch)
tree56d7edd9250228f9b4c41ed87e1358ee37296a7e /chrome/browser/sync/profile_sync_service.cc
parentc8b4944b44f10dc92209737015d81ca5eac9c1e7 (diff)
downloadchromium_src-1fc9b3ffe78b02bcb819fefa2b0884a1e31d060b.zip
chromium_src-1fc9b3ffe78b02bcb819fefa2b0884a1e31d060b.tar.gz
chromium_src-1fc9b3ffe78b02bcb819fefa2b0884a1e31d060b.tar.bz2
Implement the gaia captcha state and unlock capability in the sync setup wizard.
BUG=19738 TEST=Get a Google Account into captcha state. Start syncing. You should be presented with a captcha image and textbox to answer the challenge. Doing so correctly shoud unlock your account and proceed with sync setup. Review URL: http://codereview.chromium.org/389017 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@31829 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/sync/profile_sync_service.cc')
-rw-r--r--chrome/browser/sync/profile_sync_service.cc5
1 files changed, 3 insertions, 2 deletions
diff --git a/chrome/browser/sync/profile_sync_service.cc b/chrome/browser/sync/profile_sync_service.cc
index 953ebd3..d380578 100644
--- a/chrome/browser/sync/profile_sync_service.cc
+++ b/chrome/browser/sync/profile_sync_service.cc
@@ -329,13 +329,14 @@ string16 ProfileSyncService::GetAuthenticatedUsername() const {
}
void ProfileSyncService::OnUserSubmittedAuth(
- const std::string& username, const std::string& password) {
+ const std::string& username, const std::string& password,
+ const std::string& captcha) {
last_attempted_user_email_ = username;
is_auth_in_progress_ = true;
FOR_EACH_OBSERVER(Observer, observers_, OnStateChanged());
auth_start_time_ = base::TimeTicks::Now();
- backend_->Authenticate(username, password);
+ backend_->Authenticate(username, password, captcha);
}
void ProfileSyncService::OnUserAcceptedMergeAndSync() {