| 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 143 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 154 std::string resource_identifier) override; | 154 std::string resource_identifier) override; |
| 155 | 155 |
| 156 // Overriden from GaiaAuthConsumer. | 156 // Overriden from GaiaAuthConsumer. |
| 157 void OnListAccountsSuccess(const std::string& data) override; | 157 void OnListAccountsSuccess(const std::string& data) override; |
| 158 void OnListAccountsFailure(const GoogleServiceAuthError& error) override; | 158 void OnListAccountsFailure(const GoogleServiceAuthError& error) override; |
| 159 | 159 |
| 160 // Overriden from MergeSessionHelper::Observer. | 160 // Overriden from MergeSessionHelper::Observer. |
| 161 void OnAddAccountToCookieCompleted( | 161 void OnAddAccountToCookieCompleted( |
| 162 const std::string& account_id, | 162 const std::string& account_id, |
| 163 const GoogleServiceAuthError& error) override; | 163 const GoogleServiceAuthError& error) override; |
| 164 void GetCheckConnectionInfoCompleted(bool succeeded) override; | |
| 165 | 164 |
| 166 // Overriden from OAuth2TokenService::Observer. | 165 // Overriden from OAuth2TokenService::Observer. |
| 167 void OnEndBatchChanges() override; | 166 void OnEndBatchChanges() override; |
| 168 | 167 |
| 169 // Overriden from SigninManagerBase::Observer. | 168 // Overriden from SigninManagerBase::Observer. |
| 170 void GoogleSigninSucceeded(const std::string& account_id, | 169 void GoogleSigninSucceeded(const std::string& account_id, |
| 171 const std::string& username, | 170 const std::string& username, |
| 172 const std::string& password) override; | 171 const std::string& password) override; |
| 173 void GoogleSignedOut(const std::string& account_id, | 172 void GoogleSignedOut(const std::string& account_id, |
| 174 const std::string& username) override; | 173 const std::string& username) override; |
| (...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 218 | 217 |
| 219 std::deque<GetAccountsFromCookieCallback> get_gaia_accounts_callbacks_; | 218 std::deque<GetAccountsFromCookieCallback> get_gaia_accounts_callbacks_; |
| 220 | 219 |
| 221 scoped_ptr<SigninClient::CookieChangedSubscription> | 220 scoped_ptr<SigninClient::CookieChangedSubscription> |
| 222 cookie_changed_subscription_; | 221 cookie_changed_subscription_; |
| 223 | 222 |
| 224 DISALLOW_COPY_AND_ASSIGN(AccountReconcilor); | 223 DISALLOW_COPY_AND_ASSIGN(AccountReconcilor); |
| 225 }; | 224 }; |
| 226 | 225 |
| 227 #endif // COMPONENTS_SIGNIN_CORE_BROWSER_ACCOUNT_RECONCILOR_H_ | 226 #endif // COMPONENTS_SIGNIN_CORE_BROWSER_ACCOUNT_RECONCILOR_H_ |
| OLD | NEW |