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

Unified Diff: chrome/browser/ui/sync/one_click_signin_helper.cc

Issue 12289003: When signing in to chrome explicitly (first run, ntp, wrench) don't wait for (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebased Created 7 years, 10 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/sync/one_click_signin_helper.cc
diff --git a/chrome/browser/ui/sync/one_click_signin_helper.cc b/chrome/browser/ui/sync/one_click_signin_helper.cc
index 8be6a768689f4b280acf314f81a8ef06edee12ce..679a3deb2f9c25b040abcc8b4c9c7fbf1a951a29 100644
--- a/chrome/browser/ui/sync/one_click_signin_helper.cc
+++ b/chrome/browser/ui/sync/one_click_signin_helper.cc
@@ -889,7 +889,6 @@ void OneClickSigninHelper::RedirectToNTP() {
contents->OpenURL(params);
error_message_.clear();
- signin_tracker_.reset();
}
void OneClickSigninHelper::CleanTransientState() {
@@ -1105,6 +1104,7 @@ void OneClickSigninHelper::DidStopLoading(
if (source_ != SyncPromoUI::SOURCE_SETTINGS &&
source_ != SyncPromoUI::SOURCE_WEBSTORE_INSTALL) {
signin_tracker_.reset(new SigninTracker(profile, this));
+ RedirectToNTP();
}
break;
}
@@ -1172,8 +1172,9 @@ void OneClickSigninHelper::SigninFailed(const GoogleServiceAuthError& error) {
}
RedirectToNTP();
+ signin_tracker_.reset();
}
void OneClickSigninHelper::SigninSuccess() {
- RedirectToNTP();
+ signin_tracker_.reset();
}
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698