Chromium Code Reviews| 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 27 matching lines...) Expand all Loading... | |
| 38 | 38 |
| 39 // Convenience function to get the ExtensionSyncService for a BrowserContext. | 39 // Convenience function to get the ExtensionSyncService for a BrowserContext. |
| 40 static ExtensionSyncService* Get(content::BrowserContext* context); | 40 static ExtensionSyncService* Get(content::BrowserContext* context); |
| 41 | 41 |
| 42 // Notifies Sync (if needed) of a newly-installed extension or a change to | 42 // Notifies Sync (if needed) of a newly-installed extension or a change to |
| 43 // an existing extension. Call this when you change an extension setting that | 43 // an existing extension. Call this when you change an extension setting that |
| 44 // is synced as part of ExtensionSyncData (e.g. incognito_enabled or | 44 // is synced as part of ExtensionSyncData (e.g. incognito_enabled or |
| 45 // all_urls_enabled). | 45 // all_urls_enabled). |
| 46 void SyncExtensionChangeIfNeeded(const extensions::Extension& extension); | 46 void SyncExtensionChangeIfNeeded(const extensions::Extension& extension); |
| 47 | 47 |
| 48 bool HasPendingReenable(const std::string& id, | |
|
Devlin
2015/10/16 02:40:24
Nit: method comments
Marc Treib
2015/10/16 09:22:20
Done.
| |
| 49 const base::Version& version) const; | |
| 50 | |
| 48 // syncer::SyncableService implementation. | 51 // syncer::SyncableService implementation. |
| 49 syncer::SyncMergeResult MergeDataAndStartSyncing( | 52 syncer::SyncMergeResult MergeDataAndStartSyncing( |
| 50 syncer::ModelType type, | 53 syncer::ModelType type, |
| 51 const syncer::SyncDataList& initial_sync_data, | 54 const syncer::SyncDataList& initial_sync_data, |
| 52 scoped_ptr<syncer::SyncChangeProcessor> sync_processor, | 55 scoped_ptr<syncer::SyncChangeProcessor> sync_processor, |
| 53 scoped_ptr<syncer::SyncErrorFactory> sync_error_factory) override; | 56 scoped_ptr<syncer::SyncErrorFactory> sync_error_factory) override; |
| 54 void StopSyncing(syncer::ModelType type) override; | 57 void StopSyncing(syncer::ModelType type) override; |
| 55 syncer::SyncDataList GetAllSyncData(syncer::ModelType type) const override; | 58 syncer::SyncDataList GetAllSyncData(syncer::ModelType type) const override; |
| 56 syncer::SyncError ProcessSyncChanges( | 59 syncer::SyncError ProcessSyncChanges( |
| 57 const tracked_objects::Location& from_here, | 60 const tracked_objects::Location& from_here, |
| (...skipping 72 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 130 | 133 |
| 131 // Run()ning tells sync to try and start soon, because syncable changes | 134 // Run()ning tells sync to try and start soon, because syncable changes |
| 132 // have started happening. It will cause sync to call us back | 135 // have started happening. It will cause sync to call us back |
| 133 // asynchronously via MergeDataAndStartSyncing as soon as possible. | 136 // asynchronously via MergeDataAndStartSyncing as soon as possible. |
| 134 syncer::SyncableService::StartSyncFlare flare_; | 137 syncer::SyncableService::StartSyncFlare flare_; |
| 135 | 138 |
| 136 DISALLOW_COPY_AND_ASSIGN(ExtensionSyncService); | 139 DISALLOW_COPY_AND_ASSIGN(ExtensionSyncService); |
| 137 }; | 140 }; |
| 138 | 141 |
| 139 #endif // CHROME_BROWSER_EXTENSIONS_EXTENSION_SYNC_SERVICE_H_ | 142 #endif // CHROME_BROWSER_EXTENSIONS_EXTENSION_SYNC_SERVICE_H_ |
| OLD | NEW |