| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 #ifndef COMPONENTS_SIGNIN_CORE_BROWSER_ACCOUNT_RECONCILOR_H_ | 4 #ifndef COMPONENTS_SIGNIN_CORE_BROWSER_ACCOUNT_RECONCILOR_H_ |
| 5 #define COMPONENTS_SIGNIN_CORE_BROWSER_ACCOUNT_RECONCILOR_H_ | 5 #define COMPONENTS_SIGNIN_CORE_BROWSER_ACCOUNT_RECONCILOR_H_ |
| 6 | 6 |
| 7 #include <deque> | 7 #include <deque> |
| 8 #include <functional> | 8 #include <functional> |
| 9 #include <set> | 9 #include <set> |
| 10 #include <string> | 10 #include <string> |
| (...skipping 195 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 206 const std::string& access_token, | 206 const std::string& access_token, |
| 207 const base::Time& expiration_time) OVERRIDE; | 207 const base::Time& expiration_time) OVERRIDE; |
| 208 virtual void OnGetTokenFailure(const OAuth2TokenService::Request* request, | 208 virtual void OnGetTokenFailure(const OAuth2TokenService::Request* request, |
| 209 const GoogleServiceAuthError& error) OVERRIDE; | 209 const GoogleServiceAuthError& error) OVERRIDE; |
| 210 | 210 |
| 211 // Overriden from OAuth2TokenService::Observer. | 211 // Overriden from OAuth2TokenService::Observer. |
| 212 virtual void OnRefreshTokenRevoked(const std::string& account_id) OVERRIDE; | 212 virtual void OnRefreshTokenRevoked(const std::string& account_id) OVERRIDE; |
| 213 virtual void OnEndBatchChanges() OVERRIDE; | 213 virtual void OnEndBatchChanges() OVERRIDE; |
| 214 | 214 |
| 215 // Overriden from SigninManagerBase::Observer. | 215 // Overriden from SigninManagerBase::Observer. |
| 216 virtual void GoogleSigninSucceeded(const std::string& username, | 216 virtual void GoogleSigninSucceeded(const std::string& account_id, |
| 217 const std::string& username, |
| 217 const std::string& password) OVERRIDE; | 218 const std::string& password) OVERRIDE; |
| 218 virtual void GoogleSignedOut(const std::string& username) OVERRIDE; | 219 virtual void GoogleSignedOut(const std::string& account_id, |
| 220 const std::string& username) OVERRIDE; |
| 219 | 221 |
| 220 void MayBeDoNextListAccounts(); | 222 void MayBeDoNextListAccounts(); |
| 221 | 223 |
| 222 // The ProfileOAuth2TokenService associated with this reconcilor. | 224 // The ProfileOAuth2TokenService associated with this reconcilor. |
| 223 ProfileOAuth2TokenService* token_service_; | 225 ProfileOAuth2TokenService* token_service_; |
| 224 | 226 |
| 225 // The SigninManager associated with this reconcilor. | 227 // The SigninManager associated with this reconcilor. |
| 226 SigninManagerBase* signin_manager_; | 228 SigninManagerBase* signin_manager_; |
| 227 | 229 |
| 228 // The SigninClient associated with this reconcilor. | 230 // The SigninClient associated with this reconcilor. |
| (...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 262 | 264 |
| 263 std::deque<GetAccountsFromCookieCallback> get_gaia_accounts_callbacks_; | 265 std::deque<GetAccountsFromCookieCallback> get_gaia_accounts_callbacks_; |
| 264 | 266 |
| 265 scoped_ptr<SigninClient::CookieChangedCallbackList::Subscription> | 267 scoped_ptr<SigninClient::CookieChangedCallbackList::Subscription> |
| 266 cookie_changed_subscription_; | 268 cookie_changed_subscription_; |
| 267 | 269 |
| 268 DISALLOW_COPY_AND_ASSIGN(AccountReconcilor); | 270 DISALLOW_COPY_AND_ASSIGN(AccountReconcilor); |
| 269 }; | 271 }; |
| 270 | 272 |
| 271 #endif // COMPONENTS_SIGNIN_CORE_BROWSER_ACCOUNT_RECONCILOR_H_ | 273 #endif // COMPONENTS_SIGNIN_CORE_BROWSER_ACCOUNT_RECONCILOR_H_ |
| OLD | NEW |