diff options
| author | tim@chromium.org <tim@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-21 21:48:16 +0000 |
|---|---|---|
| committer | tim@chromium.org <tim@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-21 21:48:16 +0000 |
| commit | 62828b10e4a87405159a7516be36c826bf397e36 (patch) | |
| tree | 6a8e16482d5b4b2388222d5aa88a57627cb76dee /chrome/browser/sync/profile_sync_service.h | |
| parent | c11f6dd8dd485e3d441c22469839b703c9948bed (diff) | |
| download | chromium_src-62828b10e4a87405159a7516be36c826bf397e36.zip chromium_src-62828b10e4a87405159a7516be36c826bf397e36.tar.gz chromium_src-62828b10e4a87405159a7516be36c826bf397e36.tar.bz2 | |
sync: listen for missing notifications
This adds a 'Could not connect' error if the server is unreachable instead of infinite spin. Trying to sign in again won't work though, because there's no path to re-attempt backend initialization. I'm going to add a way for SBH to callback on failure as well as success in an upcoming patch, but it's separable from this change.
BUG=87871,85022,88109
TEST=SyncSetupWizardTest, ProfileSyncServiceStartupTest
Review URL: http://codereview.chromium.org/7464005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@93485 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/sync/profile_sync_service.h')
| -rw-r--r-- | chrome/browser/sync/profile_sync_service.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/chrome/browser/sync/profile_sync_service.h b/chrome/browser/sync/profile_sync_service.h index cbee0a23..6d3a610 100644 --- a/chrome/browser/sync/profile_sync_service.h +++ b/chrome/browser/sync/profile_sync_service.h @@ -141,8 +141,9 @@ class ProfileSyncService : public browser_sync::SyncFrontend, // Sync server URL for dev channel users static const char* kDevServerUrl; - ProfileSyncService(ProfileSyncFactory* factory_, + ProfileSyncService(ProfileSyncFactory* factory, Profile* profile, + SigninManager* signin, // Service takes ownership. const std::string& cros_user); virtual ~ProfileSyncService(); @@ -521,6 +522,7 @@ class ProfileSyncService : public browser_sync::SyncFrontend, private: friend class ProfileSyncServicePasswordTest; friend class TestProfileSyncService; + friend class ProfileSyncServiceForWizardTest; FRIEND_TEST_ALL_PREFIXES(ProfileSyncServiceTest, InitialState); // If |delete_sync_data_folder| is true, then this method will delete all |