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

Unified Diff: components/sync_bookmarks/bookmark_model_associator.h

Issue 2376123003: [Sync] Move //components/sync to the syncer namespace. (Closed)
Patch Set: Rebase. Created 4 years, 3 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
Index: components/sync_bookmarks/bookmark_model_associator.h
diff --git a/components/sync_bookmarks/bookmark_model_associator.h b/components/sync_bookmarks/bookmark_model_associator.h
index dc0d65a4d5683b03d00880d472bdf3855b73b6be..926a3510037271754c91a2d31aaeeca83dd7af2e 100644
--- a/components/sync_bookmarks/bookmark_model_associator.h
+++ b/components/sync_bookmarks/bookmark_model_associator.h
@@ -36,12 +36,9 @@ class BookmarkNode;
namespace syncer {
class BaseNode;
class BaseTransaction;
-struct UserShare;
-class WriteTransaction;
-}
-
-namespace sync_driver {
class SyncClient;
+class WriteTransaction;
+struct UserShare;
}
namespace sync_bookmarks {
@@ -51,8 +48,8 @@ namespace sync_bookmarks {
// * Methods to get a bookmark node for a given sync node and vice versa.
// * Persisting model associations and loading them back.
class BookmarkModelAssociator
- : public sync_driver::
- PerDataTypeAssociatorInterface<bookmarks::BookmarkNode, int64_t> {
+ : public syncer::PerDataTypeAssociatorInterface<bookmarks::BookmarkNode,
+ int64_t> {
public:
static syncer::ModelType model_type() { return syncer::BOOKMARKS; }
// |expect_mobile_bookmarks_folder| controls whether or not we
@@ -60,7 +57,7 @@ class BookmarkModelAssociator
// Should be set to true only by mobile clients.
BookmarkModelAssociator(
bookmarks::BookmarkModel* bookmark_model,
- sync_driver::SyncClient* sync_client,
+ syncer::SyncClient* sync_client,
syncer::UserShare* user_share,
std::unique_ptr<syncer::DataTypeErrorHandler> unrecoverable_error_handler,
bool expect_mobile_bookmarks_folder);
@@ -293,7 +290,7 @@ class BookmarkModelAssociator
base::ThreadChecker thread_checker_;
bookmarks::BookmarkModel* bookmark_model_;
- sync_driver::SyncClient* sync_client_;
+ syncer::SyncClient* sync_client_;
syncer::UserShare* user_share_;
std::unique_ptr<syncer::DataTypeErrorHandler> unrecoverable_error_handler_;
const bool expect_mobile_bookmarks_folder_;

Powered by Google App Engine
This is Rietveld 408576698