diff options
| author | chron@chromium.org <chron@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-19 18:44:19 +0000 |
|---|---|---|
| committer | chron@chromium.org <chron@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-19 18:44:19 +0000 |
| commit | 99074c5d22fac9f990aebe5055ea0bf68aef7ad7 (patch) | |
| tree | 0ec4b33ed7b0758221befa68e1bba2c6fec0010f /chrome/browser/net/gaia/token_service.cc | |
| parent | 2313f55f13ee9f5d45f85a22f9e0459990aedc5a (diff) | |
| download | chromium_src-99074c5d22fac9f990aebe5055ea0bf68aef7ad7.zip chromium_src-99074c5d22fac9f990aebe5055ea0bf68aef7ad7.tar.gz chromium_src-99074c5d22fac9f990aebe5055ea0bf68aef7ad7.tar.bz2 | |
Switch to GoogleServiceAuthError struct instead of GaiaAuthError.
Remove CAPTCHA code from existing user controller and plumb into google
authenticator2.
TEST=Install ChromeOS build. Hit Captcha. Enter captcha.
BUG=50408
Review URL: http://codereview.chromium.org/3134009
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@56724 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/net/gaia/token_service.cc')
| -rw-r--r-- | chrome/browser/net/gaia/token_service.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/browser/net/gaia/token_service.cc b/chrome/browser/net/gaia/token_service.cc index 103c102..b46868f 100644 --- a/chrome/browser/net/gaia/token_service.cc +++ b/chrome/browser/net/gaia/token_service.cc @@ -138,7 +138,7 @@ void TokenService::FireTokenAvailableNotification( void TokenService::FireTokenRequestFailedNotification( const std::string& service, - const GaiaAuthError& error) { + const GoogleServiceAuthError& error) { TokenRequestFailedDetails details(service, error); NotificationService::current()->Notify( @@ -157,7 +157,7 @@ void TokenService::OnIssueAuthTokenSuccess(const std::string& service, } void TokenService::OnIssueAuthTokenFailure(const std::string& service, - const GaiaAuthError& error) { + const GoogleServiceAuthError& error) { DCHECK(ChromeThread::CurrentlyOn(ChromeThread::UI)); LOG(WARNING) << "Auth token issuing failed for service:" << service; FireTokenRequestFailedNotification(service, error); |