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

Side by Side Diff: components/sync_bookmarks/bookmark_model_associator.cc

Issue 2203673002: [Sync] Move //components/sync_driver to //components/sync/driver. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@sd-a
Patch Set: Full change rebased on static lib. Created 4 years, 4 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 unified diff | Download patch
« no previous file with comments | « components/sync_bookmarks/bookmark_model_associator.h ('k') | components/sync_driver.gypi » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2012 The Chromium Authors. All rights reserved. 1 // Copyright 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "components/sync_bookmarks/bookmark_model_associator.h" 5 #include "components/sync_bookmarks/bookmark_model_associator.h"
6 6
7 #include <memory> 7 #include <memory>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/command_line.h" 10 #include "base/command_line.h"
(...skipping 12 matching lines...) Expand all
23 #include "components/sync/api/sync_error.h" 23 #include "components/sync/api/sync_error.h"
24 #include "components/sync/api/sync_merge_result.h" 24 #include "components/sync/api/sync_merge_result.h"
25 #include "components/sync/base/cryptographer.h" 25 #include "components/sync/base/cryptographer.h"
26 #include "components/sync/base/data_type_histogram.h" 26 #include "components/sync/base/data_type_histogram.h"
27 #include "components/sync/core/delete_journal.h" 27 #include "components/sync/core/delete_journal.h"
28 #include "components/sync/core/read_node.h" 28 #include "components/sync/core/read_node.h"
29 #include "components/sync/core/read_transaction.h" 29 #include "components/sync/core/read_transaction.h"
30 #include "components/sync/core/write_node.h" 30 #include "components/sync/core/write_node.h"
31 #include "components/sync/core/write_transaction.h" 31 #include "components/sync/core/write_transaction.h"
32 #include "components/sync/core_impl/syncapi_internal.h" 32 #include "components/sync/core_impl/syncapi_internal.h"
33 #include "components/sync/driver/sync_client.h"
33 #include "components/sync/syncable/entry.h" 34 #include "components/sync/syncable/entry.h"
34 #include "components/sync/syncable/syncable_write_transaction.h" 35 #include "components/sync/syncable/syncable_write_transaction.h"
35 #include "components/sync_bookmarks/bookmark_change_processor.h" 36 #include "components/sync_bookmarks/bookmark_change_processor.h"
36 #include "components/sync_driver/sync_client.h"
37 #include "components/undo/bookmark_undo_service.h" 37 #include "components/undo/bookmark_undo_service.h"
38 #include "components/undo/bookmark_undo_utils.h" 38 #include "components/undo/bookmark_undo_utils.h"
39 39
40 using bookmarks::BookmarkModel; 40 using bookmarks::BookmarkModel;
41 using bookmarks::BookmarkNode; 41 using bookmarks::BookmarkNode;
42 42
43 namespace browser_sync { 43 namespace browser_sync {
44 44
45 // The sync protocol identifies top-level entities by means of well-known tags, 45 // The sync protocol identifies top-level entities by means of well-known tags,
46 // which should not be confused with titles. Each tag corresponds to a 46 // which should not be confused with titles. Each tag corresponds to a
(...skipping 962 matching lines...) Expand 10 before | Expand all | Expand 10 after
1009 syncer::BOOKMARKS); 1009 syncer::BOOKMARKS);
1010 } else { 1010 } else {
1011 context->set_native_model_sync_state(BEHIND); 1011 context->set_native_model_sync_state(BEHIND);
1012 } 1012 }
1013 } 1013 }
1014 } 1014 }
1015 return syncer::SyncError(); 1015 return syncer::SyncError();
1016 } 1016 }
1017 1017
1018 } // namespace browser_sync 1018 } // namespace browser_sync
OLDNEW
« no previous file with comments | « components/sync_bookmarks/bookmark_model_associator.h ('k') | components/sync_driver.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698