| 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 <memory> | 9 #include <memory> |
| 10 #include <set> | 10 #include <set> |
| (...skipping 13 matching lines...) Expand all Loading... |
| 24 #include "components/signin/core/browser/signin_client.h" | 24 #include "components/signin/core/browser/signin_client.h" |
| 25 #include "components/signin/core/browser/signin_header_helper.h" | 25 #include "components/signin/core/browser/signin_header_helper.h" |
| 26 #include "components/signin/core/browser/signin_manager.h" | 26 #include "components/signin/core/browser/signin_manager.h" |
| 27 #include "components/signin/core/browser/signin_metrics.h" | 27 #include "components/signin/core/browser/signin_metrics.h" |
| 28 #include "google_apis/gaia/google_service_auth_error.h" | 28 #include "google_apis/gaia/google_service_auth_error.h" |
| 29 #include "google_apis/gaia/oauth2_token_service.h" | 29 #include "google_apis/gaia/oauth2_token_service.h" |
| 30 | 30 |
| 31 class ProfileOAuth2TokenService; | 31 class ProfileOAuth2TokenService; |
| 32 class SigninClient; | 32 class SigninClient; |
| 33 | 33 |
| 34 namespace net { | |
| 35 class CanonicalCookie; | |
| 36 } | |
| 37 | |
| 38 class AccountReconcilor : public KeyedService, | 34 class AccountReconcilor : public KeyedService, |
| 39 public content_settings::Observer, | 35 public content_settings::Observer, |
| 40 public GaiaCookieManagerService::Observer, | 36 public GaiaCookieManagerService::Observer, |
| 41 public OAuth2TokenService::Observer, | 37 public OAuth2TokenService::Observer, |
| 42 public SigninManagerBase::Observer { | 38 public SigninManagerBase::Observer { |
| 43 public: | 39 public: |
| 44 AccountReconcilor(ProfileOAuth2TokenService* token_service, | 40 AccountReconcilor(ProfileOAuth2TokenService* token_service, |
| 45 SigninManagerBase* signin_manager, | 41 SigninManagerBase* signin_manager, |
| 46 SigninClient* client, | 42 SigninClient* client, |
| 47 GaiaCookieManagerService* cookie_manager_service); | 43 GaiaCookieManagerService* cookie_manager_service); |
| (...skipping 150 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 198 // These members are used to validate the tokens in OAuth2TokenService. | 194 // These members are used to validate the tokens in OAuth2TokenService. |
| 199 std::string primary_account_; | 195 std::string primary_account_; |
| 200 std::vector<std::string> chrome_accounts_; | 196 std::vector<std::string> chrome_accounts_; |
| 201 std::vector<std::string> add_to_cookie_; | 197 std::vector<std::string> add_to_cookie_; |
| 202 bool chrome_accounts_changed_; | 198 bool chrome_accounts_changed_; |
| 203 | 199 |
| 204 DISALLOW_COPY_AND_ASSIGN(AccountReconcilor); | 200 DISALLOW_COPY_AND_ASSIGN(AccountReconcilor); |
| 205 }; | 201 }; |
| 206 | 202 |
| 207 #endif // COMPONENTS_SIGNIN_CORE_BROWSER_ACCOUNT_RECONCILOR_H_ | 203 #endif // COMPONENTS_SIGNIN_CORE_BROWSER_ACCOUNT_RECONCILOR_H_ |
| OLD | NEW |