| Index: google_apis/gaia/google_service_auth_error.h
|
| diff --git a/google_apis/gaia/google_service_auth_error.h b/google_apis/gaia/google_service_auth_error.h
|
| index 9549ad7817459c4f47b55a8f44d0368c4d82a423..2736e5766d7c5789fac4b405df5b78bb2893011f 100644
|
| --- a/google_apis/gaia/google_service_auth_error.h
|
| +++ b/google_apis/gaia/google_service_auth_error.h
|
| @@ -74,9 +74,9 @@ class GoogleServiceAuthError {
|
| // prior to completion.
|
| REQUEST_CANCELED = 9,
|
|
|
| - // The user has provided a HOSTED account, when this service requires
|
| - // a GOOGLE account.
|
| - HOSTED_NOT_ALLOWED = 10,
|
| + // HOSTED accounts are deprecated; left in enumeration to match
|
| + // GoogleServiceAuthError enum in histograms.xml.
|
| + HOSTED_NOT_ALLOWED_DEPRECATED = 10,
|
|
|
| // Indicates the service responded to a request, but we cannot
|
| // interpret the response.
|
| @@ -129,11 +129,11 @@ class GoogleServiceAuthError {
|
|
|
| // Globally identifies the specific second-factor challenge.
|
| std::string token;
|
| - // Localised prompt text, eg Enter the verification code sent to your
|
| - // phone number ending in XXX.
|
| + // Localized prompt text, e.g. "Enter the verification code sent to your
|
| + // phone number ending in XXX".
|
| std::string prompt_text;
|
| - // Localized text describing an alternate option, eg Get a verification
|
| - // code in a text message.
|
| + // Localized text describing an alternate option, e.g. "Get a verification
|
| + // code in a text message".
|
| std::string alternate_text;
|
| // Character length for the challenge field.
|
| int field_length;
|
| @@ -176,6 +176,8 @@ class GoogleServiceAuthError {
|
| // to explicit class and State enum relation. Note: shouldn't be inlined!
|
| static GoogleServiceAuthError AuthErrorNone();
|
|
|
| + static bool IsDeprecated(State state);
|
| +
|
| // The error information.
|
| State state() const;
|
| const Captcha& captcha() const;
|
|
|