| 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 <set> | 8 #include <set> |
| 9 #include <string> | 9 #include <string> |
| 10 #include <utility> | 10 #include <utility> |
| (...skipping 684 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 695 // Used by tests. | 695 // Used by tests. |
| 696 bool auto_start_enabled() const; | 696 bool auto_start_enabled() const; |
| 697 bool setup_in_progress() const; | 697 bool setup_in_progress() const; |
| 698 | 698 |
| 699 // Stops the sync backend and sets the flag for suppressing sync startup. | 699 // Stops the sync backend and sets the flag for suppressing sync startup. |
| 700 void StopAndSuppress(); | 700 void StopAndSuppress(); |
| 701 | 701 |
| 702 // Resets the flag for suppressing sync startup and starts the sync backend. | 702 // Resets the flag for suppressing sync startup and starts the sync backend. |
| 703 virtual void UnsuppressAndStart(); | 703 virtual void UnsuppressAndStart(); |
| 704 | 704 |
| 705 // Marks all currently registered types as "acknowledged" so we won't prompt | |
| 706 // the user about them any more. | |
| 707 void AcknowledgeSyncedTypes(); | |
| 708 | |
| 709 SyncErrorController* sync_error_controller() { | 705 SyncErrorController* sync_error_controller() { |
| 710 return sync_error_controller_.get(); | 706 return sync_error_controller_.get(); |
| 711 } | 707 } |
| 712 | 708 |
| 713 // TODO(sync): This is only used in tests. Can we remove it? | 709 // TODO(sync): This is only used in tests. Can we remove it? |
| 714 const sync_driver::DataTypeStatusTable& data_type_status_table() const; | 710 const sync_driver::DataTypeStatusTable& data_type_status_table() const; |
| 715 | 711 |
| 716 sync_driver::DataTypeManager::ConfigureStatus configure_status() { | 712 sync_driver::DataTypeManager::ConfigureStatus configure_status() { |
| 717 return configure_status_; | 713 return configure_status_; |
| 718 } | 714 } |
| (...skipping 455 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1174 base::WeakPtrFactory<ProfileSyncService> startup_controller_weak_factory_; | 1170 base::WeakPtrFactory<ProfileSyncService> startup_controller_weak_factory_; |
| 1175 | 1171 |
| 1176 DISALLOW_COPY_AND_ASSIGN(ProfileSyncService); | 1172 DISALLOW_COPY_AND_ASSIGN(ProfileSyncService); |
| 1177 }; | 1173 }; |
| 1178 | 1174 |
| 1179 bool ShouldShowActionOnUI( | 1175 bool ShouldShowActionOnUI( |
| 1180 const syncer::SyncProtocolError& error); | 1176 const syncer::SyncProtocolError& error); |
| 1181 | 1177 |
| 1182 | 1178 |
| 1183 #endif // CHROME_BROWSER_SYNC_PROFILE_SYNC_SERVICE_H_ | 1179 #endif // CHROME_BROWSER_SYNC_PROFILE_SYNC_SERVICE_H_ |
| OLD | NEW |