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 121 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
132 | 132 |
133 void ValidateAccountsFromTokenService(); | 133 void ValidateAccountsFromTokenService(); |
134 // Note internally that this |account_id| is added to the cookie jar. | 134 // Note internally that this |account_id| is added to the cookie jar. |
135 bool MarkAccountAsAddedToCookie(const std::string& account_id); | 135 bool MarkAccountAsAddedToCookie(const std::string& account_id); |
136 | 136 |
137 // Overriden from content_settings::Observer. | 137 // Overriden from content_settings::Observer. |
138 void OnContentSettingChanged( | 138 void OnContentSettingChanged( |
139 const ContentSettingsPattern& primary_pattern, | 139 const ContentSettingsPattern& primary_pattern, |
140 const ContentSettingsPattern& secondary_pattern, | 140 const ContentSettingsPattern& secondary_pattern, |
141 ContentSettingsType content_type, | 141 ContentSettingsType content_type, |
| 142 ContentSetting previous_value, |
142 std::string resource_identifier) override; | 143 std::string resource_identifier) override; |
143 | 144 |
144 // Overriden from GaiaGookieManagerService::Observer. | 145 // Overriden from GaiaGookieManagerService::Observer. |
145 void OnAddAccountToCookieCompleted( | 146 void OnAddAccountToCookieCompleted( |
146 const std::string& account_id, | 147 const std::string& account_id, |
147 const GoogleServiceAuthError& error) override; | 148 const GoogleServiceAuthError& error) override; |
148 void OnGaiaAccountsInCookieUpdated( | 149 void OnGaiaAccountsInCookieUpdated( |
149 const std::vector<gaia::ListedAccount>& accounts, | 150 const std::vector<gaia::ListedAccount>& accounts, |
150 const GoogleServiceAuthError& error) override; | 151 const GoogleServiceAuthError& error) override; |
151 | 152 |
(...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
197 // These members are used to validate the tokens in OAuth2TokenService. | 198 // These members are used to validate the tokens in OAuth2TokenService. |
198 std::string primary_account_; | 199 std::string primary_account_; |
199 std::vector<std::string> chrome_accounts_; | 200 std::vector<std::string> chrome_accounts_; |
200 std::vector<std::string> add_to_cookie_; | 201 std::vector<std::string> add_to_cookie_; |
201 bool chrome_accounts_changed_; | 202 bool chrome_accounts_changed_; |
202 | 203 |
203 DISALLOW_COPY_AND_ASSIGN(AccountReconcilor); | 204 DISALLOW_COPY_AND_ASSIGN(AccountReconcilor); |
204 }; | 205 }; |
205 | 206 |
206 #endif // COMPONENTS_SIGNIN_CORE_BROWSER_ACCOUNT_RECONCILOR_H_ | 207 #endif // COMPONENTS_SIGNIN_CORE_BROWSER_ACCOUNT_RECONCILOR_H_ |
OLD | NEW |