| OLD | NEW |
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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_EXTENSIONS_EXTENSION_SYNC_SERVICE_H_ | 5 #ifndef CHROME_BROWSER_EXTENSIONS_EXTENSION_SYNC_SERVICE_H_ |
| 6 #define CHROME_BROWSER_EXTENSIONS_EXTENSION_SYNC_SERVICE_H_ | 6 #define CHROME_BROWSER_EXTENSIONS_EXTENSION_SYNC_SERVICE_H_ |
| 7 | 7 |
| 8 #include <string> | 8 #include <string> |
| 9 #include <vector> | 9 #include <vector> |
| 10 | 10 |
| (...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 50 // it is updated to the given |version|. This happens when we get a Sync | 50 // it is updated to the given |version|. This happens when we get a Sync |
| 51 // update telling us to re-enable a newer version than what is currently | 51 // update telling us to re-enable a newer version than what is currently |
| 52 // installed. | 52 // installed. |
| 53 bool HasPendingReenable(const std::string& id, | 53 bool HasPendingReenable(const std::string& id, |
| 54 const base::Version& version) const; | 54 const base::Version& version) const; |
| 55 | 55 |
| 56 // syncer::SyncableService implementation. | 56 // syncer::SyncableService implementation. |
| 57 syncer::SyncMergeResult MergeDataAndStartSyncing( | 57 syncer::SyncMergeResult MergeDataAndStartSyncing( |
| 58 syncer::ModelType type, | 58 syncer::ModelType type, |
| 59 const syncer::SyncDataList& initial_sync_data, | 59 const syncer::SyncDataList& initial_sync_data, |
| 60 scoped_ptr<syncer::SyncChangeProcessor> sync_processor, | 60 std::unique_ptr<syncer::SyncChangeProcessor> sync_processor, |
| 61 scoped_ptr<syncer::SyncErrorFactory> sync_error_factory) override; | 61 std::unique_ptr<syncer::SyncErrorFactory> sync_error_factory) override; |
| 62 void StopSyncing(syncer::ModelType type) override; | 62 void StopSyncing(syncer::ModelType type) override; |
| 63 syncer::SyncDataList GetAllSyncData(syncer::ModelType type) const override; | 63 syncer::SyncDataList GetAllSyncData(syncer::ModelType type) const override; |
| 64 syncer::SyncError ProcessSyncChanges( | 64 syncer::SyncError ProcessSyncChanges( |
| 65 const tracked_objects::Location& from_here, | 65 const tracked_objects::Location& from_here, |
| 66 const syncer::SyncChangeList& change_list) override; | 66 const syncer::SyncChangeList& change_list) override; |
| 67 | 67 |
| 68 void SetSyncStartFlareForTesting( | 68 void SetSyncStartFlareForTesting( |
| 69 const syncer::SyncableService::StartSyncFlare& flare); | 69 const syncer::SyncableService::StartSyncFlare& flare); |
| 70 | 70 |
| 71 // Special hack: There was a bug where themes incorrectly ended up in the | 71 // Special hack: There was a bug where themes incorrectly ended up in the |
| (...skipping 79 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 151 | 151 |
| 152 // Run()ning tells sync to try and start soon, because syncable changes | 152 // Run()ning tells sync to try and start soon, because syncable changes |
| 153 // have started happening. It will cause sync to call us back | 153 // have started happening. It will cause sync to call us back |
| 154 // asynchronously via MergeDataAndStartSyncing as soon as possible. | 154 // asynchronously via MergeDataAndStartSyncing as soon as possible. |
| 155 syncer::SyncableService::StartSyncFlare flare_; | 155 syncer::SyncableService::StartSyncFlare flare_; |
| 156 | 156 |
| 157 DISALLOW_COPY_AND_ASSIGN(ExtensionSyncService); | 157 DISALLOW_COPY_AND_ASSIGN(ExtensionSyncService); |
| 158 }; | 158 }; |
| 159 | 159 |
| 160 #endif // CHROME_BROWSER_EXTENSIONS_EXTENSION_SYNC_SERVICE_H_ | 160 #endif // CHROME_BROWSER_EXTENSIONS_EXTENSION_SYNC_SERVICE_H_ |
| OLD | NEW |