| 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 // | 4 // | 
| 5 // The signin manager encapsulates some functionality tracking | 5 // The signin manager encapsulates some functionality tracking | 
| 6 // which user is signed in. See SigninManagerBase for full description of | 6 // which user is signed in. See SigninManagerBase for full description of | 
| 7 // responsibilities. The class defined in this file provides functionality | 7 // responsibilities. The class defined in this file provides functionality | 
| 8 // required by all platforms except Chrome OS. | 8 // required by all platforms except Chrome OS. | 
| 9 // | 9 // | 
| 10 // When a user is signed in, a ClientLogin request is run on their behalf. | 10 // When a user is signed in, a ClientLogin request is run on their behalf. | 
| (...skipping 175 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 186 | 186 | 
| 187   // The type of sign being performed.  This value is valid only between a call | 187   // The type of sign being performed.  This value is valid only between a call | 
| 188   // to one of the StartSigninXXX methods and when the sign in is either | 188   // to one of the StartSigninXXX methods and when the sign in is either | 
| 189   // successful or not. | 189   // successful or not. | 
| 190   SigninType type_; | 190   SigninType type_; | 
| 191 | 191 | 
| 192   // Temporarily saves the oauth2 refresh token.  It will be passed to the | 192   // Temporarily saves the oauth2 refresh token.  It will be passed to the | 
| 193   // token service so that it does not need to mint new ones. | 193   // token service so that it does not need to mint new ones. | 
| 194   std::string temp_refresh_token_; | 194   std::string temp_refresh_token_; | 
| 195 | 195 | 
| 196   base::WeakPtrFactory<SigninManager> weak_pointer_factory_; |  | 
| 197 |  | 
| 198   // The SigninClient object associated with this object. Must outlive this | 196   // The SigninClient object associated with this object. Must outlive this | 
| 199   // object. | 197   // object. | 
| 200   SigninClient* client_; | 198   SigninClient* client_; | 
| 201 | 199 | 
| 202   // The ProfileOAuth2TokenService instance associated with this object. Must | 200   // The ProfileOAuth2TokenService instance associated with this object. Must | 
| 203   // outlive this object. | 201   // outlive this object. | 
| 204   ProfileOAuth2TokenService* token_service_; | 202   ProfileOAuth2TokenService* token_service_; | 
| 205 | 203 | 
| 206   // Helper object to listen for changes to signin preferences stored in non- | 204   // Helper object to listen for changes to signin preferences stored in non- | 
| 207   // profile-specific local prefs (like kGoogleServicesUsernamePattern). | 205   // profile-specific local prefs (like kGoogleServicesUsernamePattern). | 
| 208   PrefChangeRegistrar local_state_pref_registrar_; | 206   PrefChangeRegistrar local_state_pref_registrar_; | 
| 209 | 207 | 
| 210   // Helper object to listen for changes to the signin allowed preference. | 208   // Helper object to listen for changes to the signin allowed preference. | 
| 211   BooleanPrefMember signin_allowed_; | 209   BooleanPrefMember signin_allowed_; | 
| 212 | 210 | 
| 213   // Helper to merge signed in account into the content area. | 211   // Helper to merge signed in account into the content area. | 
| 214   scoped_ptr<MergeSessionHelper> merge_session_helper_; | 212   scoped_ptr<MergeSessionHelper> merge_session_helper_; | 
| 215 | 213 | 
|  | 214   base::WeakPtrFactory<SigninManager> weak_pointer_factory_; | 
|  | 215 | 
| 216   DISALLOW_COPY_AND_ASSIGN(SigninManager); | 216   DISALLOW_COPY_AND_ASSIGN(SigninManager); | 
| 217 }; | 217 }; | 
| 218 | 218 | 
| 219 #endif  // !defined(OS_CHROMEOS) | 219 #endif  // !defined(OS_CHROMEOS) | 
| 220 | 220 | 
| 221 #endif  // COMPONENTS_SIGNIN_CORE_BROWSER_SIGNIN_MANAGER_H_ | 221 #endif  // COMPONENTS_SIGNIN_CORE_BROWSER_SIGNIN_MANAGER_H_ | 
| OLD | NEW | 
|---|