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

Unified Diff: chrome/browser/chromeos/login/google_authenticator.cc

Issue 2847080: Make login cancel logic load localaccount file before attempting offline login (Closed)
Patch Set: fix check_deps failure, comment per phajdan Created 10 years, 5 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
Index: chrome/browser/chromeos/login/google_authenticator.cc
diff --git a/chrome/browser/chromeos/login/google_authenticator.cc b/chrome/browser/chromeos/login/google_authenticator.cc
index d5b2d16a400b69415ef263dc726a698af4d60a0c..fe8de56797de5af667799a7ae6e6fad81866f4d3 100644
--- a/chrome/browser/chromeos/login/google_authenticator.cc
+++ b/chrome/browser/chromeos/login/google_authenticator.cc
@@ -63,7 +63,15 @@ GoogleAuthenticator::~GoogleAuthenticator() {}
void GoogleAuthenticator::CancelClientLogin() {
if (gaia_authenticator_->HasPendingFetch()) {
+ LOG(INFO) << "Canceling ClientLogin attempt.";
gaia_authenticator_->CancelRequest();
+
+ ChromeThread::PostTask(
+ ChromeThread::FILE, FROM_HERE,
+ NewRunnableMethod(this,
+ &GoogleAuthenticator::LoadLocalaccount,
+ std::string(kLocalaccountFile)));
+
CheckOffline("Login has timed out; please try again!");
}
}

Powered by Google App Engine
This is Rietveld 408576698