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

Unified Diff: components/sync_bookmarks/bookmark_model_associator.h

Issue 1966023002: [Sync] Move DataTypeErrorHandler to //sync. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Found an unsaved buffer :( Created 4 years, 7 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 f10e8d4927cbc3f969b10961fa6107ebdf6ff213..28d5229efd9544b01deb87ce88c455f992066458 100644
--- a/components/sync_bookmarks/bookmark_model_associator.h
+++ b/components/sync_bookmarks/bookmark_model_associator.h
@@ -21,8 +21,8 @@
#include "base/memory/weak_ptr.h"
#include "base/strings/string16.h"
#include "base/threading/thread_checker.h"
-#include "components/sync_driver/data_type_error_handler.h"
#include "components/sync_driver/model_associator.h"
+#include "sync/internal_api/public/data_type_error_handler.h"
#include "sync/internal_api/public/util/unrecoverable_error_handler.h"
class GURL;
@@ -61,7 +61,7 @@ class BookmarkModelAssociator
bookmarks::BookmarkModel* bookmark_model,
sync_driver::SyncClient* sync_client,
syncer::UserShare* user_share,
- sync_driver::DataTypeErrorHandler* unrecoverable_error_handler,
+ syncer::DataTypeErrorHandler* unrecoverable_error_handler,
bool expect_mobile_bookmarks_folder);
~BookmarkModelAssociator() override;
@@ -294,7 +294,7 @@ class BookmarkModelAssociator
bookmarks::BookmarkModel* bookmark_model_;
sync_driver::SyncClient* sync_client_;
syncer::UserShare* user_share_;
- sync_driver::DataTypeErrorHandler* unrecoverable_error_handler_;
+ syncer::DataTypeErrorHandler* unrecoverable_error_handler_;
const bool expect_mobile_bookmarks_folder_;
BookmarkIdToSyncIdMap id_map_;
SyncIdToBookmarkNodeMap id_map_inverse_;
« no previous file with comments | « components/sync_bookmarks/bookmark_change_processor.cc ('k') | components/sync_bookmarks/bookmark_model_associator.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698