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

Unified Diff: sync/internal_api/public/model_type_store_impl.h

Issue 2077713002: [USS] Store supports hosting multiple datatypes per database (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: remove includes Created 4 years, 5 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 | « sync/internal_api/public/model_type_store_backend.h ('k') | sync/syncable/model_type.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sync/internal_api/public/model_type_store_impl.h
diff --git a/sync/internal_api/public/model_type_store_impl.h b/sync/internal_api/public/model_type_store_impl.h
index 20253ef28ab899cf5481d8dae59b02cbf7706289..144f1092e554cff5100609e23eb0f70f92b00960 100644
--- a/sync/internal_api/public/model_type_store_impl.h
+++ b/sync/internal_api/public/model_type_store_impl.h
@@ -64,9 +64,12 @@ class ModelTypeStoreImpl : public ModelTypeStore, public base::NonThreadSafe {
std::unique_ptr<leveldb::WriteBatch> leveldb_write_batch_;
};
- static void BackendInitDone(const InitCallback& callback,
- std::unique_ptr<ModelTypeStoreImpl> store,
- Result result);
+ static void BackendInitDone(
+ const syncer::ModelType type,
+ std::unique_ptr<Result> result,
+ scoped_refptr<base::SequencedTaskRunner> blocking_task_runner,
+ const InitCallback& callback,
+ scoped_refptr<ModelTypeStoreBackend> backend);
// Format prefix key for data/metadata records with |type|.
static std::string FormatDataPrefix(const syncer::ModelType type);
@@ -80,7 +83,7 @@ class ModelTypeStoreImpl : public ModelTypeStore, public base::NonThreadSafe {
ModelTypeStoreImpl(
const syncer::ModelType type,
- std::unique_ptr<ModelTypeStoreBackend> backend,
+ scoped_refptr<ModelTypeStoreBackend> backend,
scoped_refptr<base::SequencedTaskRunner> backend_task_runner);
// Callbacks for different calls to ModelTypeStoreBackend.
@@ -102,15 +105,15 @@ class ModelTypeStoreImpl : public ModelTypeStore, public base::NonThreadSafe {
void WriteModificationsDone(const CallbackWithResult& callback,
Result result);
- // Backend is owned by store, but should be deleted on backend thread. To
- // accomplish this store's dtor posts task to backend thread passing backend
- // ownership to task parameter.
- std::unique_ptr<ModelTypeStoreBackend> backend_;
+ // Backend should be deleted on backend thread.
+ // To accomplish this store's dtor posts task to backend thread passing
+ // backend ownership to task parameter.
+ scoped_refptr<ModelTypeStoreBackend> backend_;
scoped_refptr<base::SequencedTaskRunner> backend_task_runner_;
// Key prefix for data/metadata records of this model type.
- const std::string dataPrefix_;
- const std::string metadataPrefix_;
+ const std::string data_prefix_;
+ const std::string metadata_prefix_;
base::WeakPtrFactory<ModelTypeStoreImpl> weak_ptr_factory_;
};
« no previous file with comments | « sync/internal_api/public/model_type_store_backend.h ('k') | sync/syncable/model_type.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698