Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(902)

Unified Diff: components/sync/device_info/device_info_service.h

Issue 2458013002: [Sync] Rename ModelTypeService to ModelTypeSyncBridge. (Closed)
Patch Set: s/SetBridgeError/ErrorOnNextCall Created 4 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « components/sync/BUILD.gn ('k') | components/sync/device_info/device_info_service.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/sync/device_info/device_info_service.h
diff --git a/components/sync/device_info/device_info_service.h b/components/sync/device_info/device_info_service.h
index c5156d07b0b56cc1db3161d4967054936b5ba1b8..aa37d3046b3f0845d99e138d5d7c40ecbf3f0346 100644
--- a/components/sync/device_info/device_info_service.h
+++ b/components/sync/device_info/device_info_service.h
@@ -19,8 +19,8 @@
#include "base/timer/timer.h"
#include "components/sync/device_info/device_info_tracker.h"
#include "components/sync/device_info/local_device_info_provider.h"
-#include "components/sync/model/model_type_service.h"
#include "components/sync/model/model_type_store.h"
+#include "components/sync/model/model_type_sync_bridge.h"
#include "components/sync/model/simple_metadata_change_list.h"
namespace sync_pb {
@@ -35,7 +35,7 @@ class SyncError;
// USS service implementation for DEVICE_INFO model type. Handles storage of
// device info and associated sync metadata, applying/merging foreign changes,
// and allows public read access.
-class DeviceInfoService : public ModelTypeService, public DeviceInfoTracker {
+class DeviceInfoService : public ModelTypeSyncBridge, public DeviceInfoTracker {
public:
typedef base::Callback<void(const ModelTypeStore::InitCallback& callback)>
StoreFactoryFunction;
@@ -45,7 +45,7 @@ class DeviceInfoService : public ModelTypeService, public DeviceInfoTracker {
const ChangeProcessorFactory& change_processor_factory);
~DeviceInfoService() override;
- // ModelTypeService implementation.
+ // ModelTypeSyncBridge implementation.
std::unique_ptr<MetadataChangeList> CreateMetadataChangeList() override;
SyncError MergeSyncData(
std::unique_ptr<MetadataChangeList> metadata_change_list,
« no previous file with comments | « components/sync/BUILD.gn ('k') | components/sync/device_info/device_info_service.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698