Chromium Code Reviews| Index: chrome/browser/sync/profile_sync_service.h |
| diff --git a/chrome/browser/sync/profile_sync_service.h b/chrome/browser/sync/profile_sync_service.h |
| index e2d509be878d227fccd2b05ca666903f3233b628..895d82ff6941b288e6d71ca17d3addcea18ee05e 100644 |
| --- a/chrome/browser/sync/profile_sync_service.h |
| +++ b/chrome/browser/sync/profile_sync_service.h |
| @@ -48,6 +48,7 @@ |
| #include "sync/js/sync_js_controller.h" |
| #include "url/gurl.h" |
| +class ManagedUserSigninManagerWrapper; |
| class Profile; |
| class ProfileOAuth2TokenService; |
| class ProfileSyncComponentsFactory; |
| @@ -259,10 +260,10 @@ class ProfileSyncService |
| // Sync server URL for dev channel users |
| static const char* kDevServerUrl; |
| - // Takes ownership of |factory|. |
| + // Takes ownership of |factory| and |signin_wrapper|. |
| ProfileSyncService(ProfileSyncComponentsFactory* factory, |
| Profile* profile, |
| - SigninManagerBase* signin, |
| + ManagedUserSigninManagerWrapper* signin_wrapper, |
| ProfileOAuth2TokenService* oauth2_token_service, |
| StartBehavior start_behavior); |
| virtual ~ProfileSyncService(); |
| @@ -639,7 +640,7 @@ class ProfileSyncService |
| const GURL& sync_service_url() const { return sync_service_url_; } |
| bool auto_start_enabled() const { return auto_start_enabled_; } |
| - SigninManagerBase* signin() const { return signin_; } |
| + SigninManagerBase* signin() const; |
| bool setup_in_progress() const { return setup_in_progress_; } |
| // Stops the sync backend and sets the flag for suppressing sync startup. |
| @@ -931,7 +932,7 @@ class ProfileSyncService |
| // Encapsulates user signin - used to set/get the user's authenticated |
| // email address. |
| - SigninManagerBase* signin_; |
| + scoped_ptr<ManagedUserSigninManagerWrapper> signin_; |
|
Roger Tawa OOO till Jul 10th
2014/02/11 21:05:37
If PSS will own the wrapper, then it seems the cto
tim (not reviewing)
2014/02/11 21:24:14
I thought about this, but ultimately felt it was b
|
| // Information describing an unrecoverable error. |
| UnrecoverableErrorReason unrecoverable_error_reason_; |