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> |
11 #include <utility> | 11 #include <utility> |
12 #include <vector> | 12 #include <vector> |
13 | 13 |
14 #include "base/basictypes.h" | 14 #include "base/basictypes.h" |
15 #include "base/callback_forward.h" | 15 #include "base/callback_forward.h" |
16 #include "base/compiler_specific.h" | 16 #include "base/compiler_specific.h" |
17 #include "base/memory/scoped_ptr.h" | 17 #include "base/memory/scoped_ptr.h" |
18 #include "base/memory/scoped_vector.h" | 18 #include "base/memory/scoped_vector.h" |
19 #include "components/keyed_service/core/keyed_service.h" | 19 #include "components/keyed_service/core/keyed_service.h" |
| 20 #include "components/signin/core/browser/signin_client.h" |
20 #include "components/signin/core/browser/signin_manager.h" | 21 #include "components/signin/core/browser/signin_manager.h" |
21 #include "google_apis/gaia/gaia_auth_consumer.h" | 22 #include "google_apis/gaia/gaia_auth_consumer.h" |
22 #include "google_apis/gaia/google_service_auth_error.h" | 23 #include "google_apis/gaia/google_service_auth_error.h" |
23 #include "google_apis/gaia/merge_session_helper.h" | 24 #include "google_apis/gaia/merge_session_helper.h" |
24 #include "google_apis/gaia/oauth2_token_service.h" | 25 #include "google_apis/gaia/oauth2_token_service.h" |
25 | 26 |
26 class GaiaAuthFetcher; | 27 class GaiaAuthFetcher; |
27 class ProfileOAuth2TokenService; | 28 class ProfileOAuth2TokenService; |
28 class SigninClient; | 29 class SigninClient; |
29 class SigninOAuthHelper; | 30 class SigninOAuthHelper; |
(...skipping 222 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
252 scoped_ptr<OAuth2TokenService::Request>* requests_; | 253 scoped_ptr<OAuth2TokenService::Request>* requests_; |
253 ScopedVector<UserIdFetcher> user_id_fetchers_; | 254 ScopedVector<UserIdFetcher> user_id_fetchers_; |
254 ScopedVector<SigninOAuthHelper> refresh_token_fetchers_; | 255 ScopedVector<SigninOAuthHelper> refresh_token_fetchers_; |
255 EmailSet valid_chrome_accounts_; | 256 EmailSet valid_chrome_accounts_; |
256 EmailSet invalid_chrome_accounts_; | 257 EmailSet invalid_chrome_accounts_; |
257 std::vector<std::string> add_to_cookie_; | 258 std::vector<std::string> add_to_cookie_; |
258 std::vector<std::pair<std::string, int> > add_to_chrome_; | 259 std::vector<std::pair<std::string, int> > add_to_chrome_; |
259 | 260 |
260 std::deque<GetAccountsFromCookieCallback> get_gaia_accounts_callbacks_; | 261 std::deque<GetAccountsFromCookieCallback> get_gaia_accounts_callbacks_; |
261 | 262 |
| 263 scoped_ptr<SigninClient::CookieChangedCallbackList::Subscription> |
| 264 cookie_changed_subscription_; |
| 265 |
262 DISALLOW_COPY_AND_ASSIGN(AccountReconcilor); | 266 DISALLOW_COPY_AND_ASSIGN(AccountReconcilor); |
263 }; | 267 }; |
264 | 268 |
265 #endif // COMPONENTS_SIGNIN_CORE_BROWSER_ACCOUNT_RECONCILOR_H_ | 269 #endif // COMPONENTS_SIGNIN_CORE_BROWSER_ACCOUNT_RECONCILOR_H_ |
OLD | NEW |