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

Unified Diff: chrome/browser/sync/glue/bookmark_model_associator.h

Issue 408003002: [Sync] Fix namespace for sync_driver component (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase Created 6 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
Index: chrome/browser/sync/glue/bookmark_model_associator.h
diff --git a/chrome/browser/sync/glue/bookmark_model_associator.h b/chrome/browser/sync/glue/bookmark_model_associator.h
index 368f8a6c55deab39c3e8b77ee60eb4bc403f997a..10f59cc2b7732df902791827bf034cdf0e92b87c 100644
--- a/chrome/browser/sync/glue/bookmark_model_associator.h
+++ b/chrome/browser/sync/glue/bookmark_model_associator.h
@@ -34,7 +34,7 @@ namespace browser_sync {
// * Methods to get a bookmark node for a given sync node and vice versa.
// * Persisting model associations and loading them back.
class BookmarkModelAssociator
- : public PerDataTypeAssociatorInterface<BookmarkNode, int64> {
+ : public sync_driver::PerDataTypeAssociatorInterface<BookmarkNode, int64> {
public:
static syncer::ModelType model_type() { return syncer::BOOKMARKS; }
// |expect_mobile_bookmarks_folder| controls whether or not we
@@ -44,7 +44,7 @@ class BookmarkModelAssociator
BookmarkModel* bookmark_model,
Profile* profile_,
syncer::UserShare* user_share,
- DataTypeErrorHandler* unrecoverable_error_handler,
+ sync_driver::DataTypeErrorHandler* unrecoverable_error_handler,
bool expect_mobile_bookmarks_folder);
virtual ~BookmarkModelAssociator();
@@ -150,7 +150,7 @@ class BookmarkModelAssociator
BookmarkModel* bookmark_model_;
Profile* profile_;
syncer::UserShare* user_share_;
- DataTypeErrorHandler* unrecoverable_error_handler_;
+ sync_driver::DataTypeErrorHandler* unrecoverable_error_handler_;
const bool expect_mobile_bookmarks_folder_;
BookmarkIdToSyncIdMap id_map_;
SyncIdToBookmarkNodeMap id_map_inverse_;

Powered by Google App Engine
This is Rietveld 408576698