| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 #ifndef CHROME_BROWSER_SYNC_PROFILE_SYNC_SERVICE_H_ | 5 #ifndef CHROME_BROWSER_SYNC_PROFILE_SYNC_SERVICE_H_ |
| 6 #define CHROME_BROWSER_SYNC_PROFILE_SYNC_SERVICE_H_ | 6 #define CHROME_BROWSER_SYNC_PROFILE_SYNC_SERVICE_H_ |
| 7 | 7 |
| 8 #include <list> | 8 #include <list> |
| 9 #include <string> | 9 #include <string> |
| 10 | 10 |
| (...skipping 630 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 641 ERROR_REASON_CONFIGURATION_RETRY, | 641 ERROR_REASON_CONFIGURATION_RETRY, |
| 642 ERROR_REASON_CONFIGURATION_FAILURE, | 642 ERROR_REASON_CONFIGURATION_FAILURE, |
| 643 ERROR_REASON_ACTIONABLE_ERROR, | 643 ERROR_REASON_ACTIONABLE_ERROR, |
| 644 ERROR_REASON_LIMIT | 644 ERROR_REASON_LIMIT |
| 645 }; | 645 }; |
| 646 friend class ProfileSyncServicePasswordTest; | 646 friend class ProfileSyncServicePasswordTest; |
| 647 friend class SyncTest; | 647 friend class SyncTest; |
| 648 friend class TestProfileSyncService; | 648 friend class TestProfileSyncService; |
| 649 FRIEND_TEST_ALL_PREFIXES(ProfileSyncServiceTest, InitialState); | 649 FRIEND_TEST_ALL_PREFIXES(ProfileSyncServiceTest, InitialState); |
| 650 | 650 |
| 651 // Detects and attempts to recover from a previous improper datatype | |
| 652 // configuration where Keep Everything Synced and the preferred types were | |
| 653 // not correctly set. | |
| 654 void TrySyncDatatypePrefRecovery(); | |
| 655 | |
| 656 // Starts up sync if it is not suppressed and preconditions are met. | 651 // Starts up sync if it is not suppressed and preconditions are met. |
| 657 // Called from Initialize() and UnsuppressAndStart(). | 652 // Called from Initialize() and UnsuppressAndStart(). |
| 658 void TryStart(); | 653 void TryStart(); |
| 659 | 654 |
| 660 // Puts the backend's sync scheduler into NORMAL mode. | 655 // Puts the backend's sync scheduler into NORMAL mode. |
| 661 // Called when configuration is complete. | 656 // Called when configuration is complete. |
| 662 void StartSyncingWithServer(); | 657 void StartSyncingWithServer(); |
| 663 | 658 |
| 664 // Called when we've determined that we don't need a passphrase (either | 659 // Called when we've determined that we don't need a passphrase (either |
| 665 // because OnPassphraseAccepted() was called, or because we've gotten a | 660 // because OnPassphraseAccepted() was called, or because we've gotten a |
| (...skipping 206 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 872 scoped_ptr<syncer::InvalidatorRegistrar> invalidator_registrar_; | 867 scoped_ptr<syncer::InvalidatorRegistrar> invalidator_registrar_; |
| 873 | 868 |
| 874 DISALLOW_COPY_AND_ASSIGN(ProfileSyncService); | 869 DISALLOW_COPY_AND_ASSIGN(ProfileSyncService); |
| 875 }; | 870 }; |
| 876 | 871 |
| 877 bool ShouldShowActionOnUI( | 872 bool ShouldShowActionOnUI( |
| 878 const syncer::SyncProtocolError& error); | 873 const syncer::SyncProtocolError& error); |
| 879 | 874 |
| 880 | 875 |
| 881 #endif // CHROME_BROWSER_SYNC_PROFILE_SYNC_SERVICE_H_ | 876 #endif // CHROME_BROWSER_SYNC_PROFILE_SYNC_SERVICE_H_ |
| OLD | NEW |