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

Unified Diff: chrome/common/net/gaia/gaia_auth_consumer.h

Issue 4980005: Allow sync with 2-factor StrongAuth accounts in ChromeOS. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Refactored 2-factor error passing Created 10 years, 1 month 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/common/net/gaia/gaia_auth_consumer.h
diff --git a/chrome/common/net/gaia/gaia_auth_consumer.h b/chrome/common/net/gaia/gaia_auth_consumer.h
index 706d19edf0930d7ec976734e02ff05655f6531ec..d498e6c64ff7de3149a9c7ff024a0fe13cd552d5 100644
--- a/chrome/common/net/gaia/gaia_auth_consumer.h
+++ b/chrome/common/net/gaia/gaia_auth_consumer.h
@@ -15,7 +15,7 @@ class GoogleServiceAuthError;
class GaiaAuthConsumer {
public:
struct ClientLoginResult {
- inline ClientLoginResult() {}
+ inline ClientLoginResult() : two_factor(false) {}
inline ClientLoginResult(const std::string& new_sid,
const std::string& new_lsid,
const std::string& new_token,
@@ -23,13 +23,15 @@ class GaiaAuthConsumer {
: sid(new_sid),
lsid(new_lsid),
token(new_token),
- data(new_data) {}
+ data(new_data),
+ two_factor(false) {}
inline bool operator==(const ClientLoginResult &b) const {
return sid == b.sid &&
lsid == b.lsid &&
token == b.token &&
- data == b.data;
+ data == b.data &&
+ two_factor == b.two_factor;
}
std::string sid;
@@ -37,6 +39,7 @@ class GaiaAuthConsumer {
std::string token;
// TODO(chron): Remove the data field later. Don't use it if possible.
std::string data; // Full contents of ClientLogin return.
+ bool two_factor; // set to true if there was a TWO_FACTOR "failure".
};
virtual ~GaiaAuthConsumer() {}
« chrome/browser/sync/profile_sync_service.h ('K') | « chrome/browser/ui/browser_init.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698