Allow sync with 2-factor StrongAuth accounts in ChromeOS.

1. Detect login with 2-factor error and direct new accounts to chrome://settings/personal
2. Open BorwserSignin from 'Set Up Sync' button in sync settings
3. Enable constrained html dialog in BrowserSigning (was implemented for ChromeOS in a previous CL)
4. Attempt to log into sync when exiting screen locker if sync becomes disabled

BUG=chromium-os:8752
TEST=see issue

Review URL: http://codereview.chromium.org/4980005

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@66690 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 6 insertions, 3 deletions

diff --git a/chrome/common/net/gaia/gaia_auth_consumer.h b/chrome/common/net/gaia/gaia_auth_consumer.h
index 706d19e..d498e6c 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() {}