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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: components/sync_bookmarks/bookmark_model_associator.cc

Issue 2401223002: [Sync] Renaming sync/api* to sync/model*. (Closed)
Patch Set: Missed a comment in a DEPS file, and rebasing. 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_bookmarks/bookmark_model_associator.h ('k') | components/sync_sessions/BUILD.gn » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/sync_bookmarks/bookmark_model_associator.cc
diff --git a/components/sync_bookmarks/bookmark_model_associator.cc b/components/sync_bookmarks/bookmark_model_associator.cc
index 6ccdea35b427467f484d1751f52185bcd0389ea8..ffa695d62456fb4829183cc8a98561fd01c7b906 100644
--- a/components/sync_bookmarks/bookmark_model_associator.cc
+++ b/components/sync_bookmarks/bookmark_model_associator.cc
@@ -18,8 +18,6 @@
#include "base/threading/thread_task_runner_handle.h"
#include "components/bookmarks/browser/bookmark_client.h"
#include "components/bookmarks/browser/bookmark_model.h"
-#include "components/sync/api/sync_error.h"
-#include "components/sync/api/sync_merge_result.h"
#include "components/sync/base/cryptographer.h"
#include "components/sync/base/data_type_histogram.h"
#include "components/sync/core/delete_journal.h"
@@ -29,6 +27,8 @@
#include "components/sync/core/write_transaction.h"
#include "components/sync/core_impl/syncapi_internal.h"
#include "components/sync/driver/sync_client.h"
+#include "components/sync/model/sync_error.h"
+#include "components/sync/model/sync_merge_result.h"
#include "components/sync/syncable/entry.h"
#include "components/sync/syncable/syncable_write_transaction.h"
#include "components/sync_bookmarks/bookmark_change_processor.h"
« no previous file with comments | « components/sync_bookmarks/bookmark_model_associator.h ('k') | components/sync_sessions/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698