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

Side by Side 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 unified diff | Download patch
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 <utility> 7 #include <utility>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/command_line.h" 10 #include "base/command_line.h"
11 #include "base/format_macros.h" 11 #include "base/format_macros.h"
12 #include "base/location.h" 12 #include "base/location.h"
13 #include "base/single_thread_task_runner.h" 13 #include "base/single_thread_task_runner.h"
14 #include "base/strings/string_number_conversions.h" 14 #include "base/strings/string_number_conversions.h"
15 #include "base/strings/string_util.h" 15 #include "base/strings/string_util.h"
16 #include "base/strings/stringprintf.h" 16 #include "base/strings/stringprintf.h"
17 #include "base/strings/utf_string_conversions.h" 17 #include "base/strings/utf_string_conversions.h"
18 #include "base/threading/thread_task_runner_handle.h" 18 #include "base/threading/thread_task_runner_handle.h"
19 #include "components/bookmarks/browser/bookmark_client.h" 19 #include "components/bookmarks/browser/bookmark_client.h"
20 #include "components/bookmarks/browser/bookmark_model.h" 20 #include "components/bookmarks/browser/bookmark_model.h"
21 #include "components/sync/api/sync_error.h"
22 #include "components/sync/api/sync_merge_result.h"
23 #include "components/sync/base/cryptographer.h" 21 #include "components/sync/base/cryptographer.h"
24 #include "components/sync/base/data_type_histogram.h" 22 #include "components/sync/base/data_type_histogram.h"
25 #include "components/sync/core/delete_journal.h" 23 #include "components/sync/core/delete_journal.h"
26 #include "components/sync/core/read_node.h" 24 #include "components/sync/core/read_node.h"
27 #include "components/sync/core/read_transaction.h" 25 #include "components/sync/core/read_transaction.h"
28 #include "components/sync/core/write_node.h" 26 #include "components/sync/core/write_node.h"
29 #include "components/sync/core/write_transaction.h" 27 #include "components/sync/core/write_transaction.h"
30 #include "components/sync/core_impl/syncapi_internal.h" 28 #include "components/sync/core_impl/syncapi_internal.h"
31 #include "components/sync/driver/sync_client.h" 29 #include "components/sync/driver/sync_client.h"
30 #include "components/sync/model/sync_error.h"
31 #include "components/sync/model/sync_merge_result.h"
32 #include "components/sync/syncable/entry.h" 32 #include "components/sync/syncable/entry.h"
33 #include "components/sync/syncable/syncable_write_transaction.h" 33 #include "components/sync/syncable/syncable_write_transaction.h"
34 #include "components/sync_bookmarks/bookmark_change_processor.h" 34 #include "components/sync_bookmarks/bookmark_change_processor.h"
35 #include "components/undo/bookmark_undo_service.h" 35 #include "components/undo/bookmark_undo_service.h"
36 #include "components/undo/bookmark_undo_utils.h" 36 #include "components/undo/bookmark_undo_utils.h"
37 37
38 using bookmarks::BookmarkModel; 38 using bookmarks::BookmarkModel;
39 using bookmarks::BookmarkNode; 39 using bookmarks::BookmarkNode;
40 40
41 namespace sync_bookmarks { 41 namespace sync_bookmarks {
(...skipping 965 matching lines...) Expand 10 before | Expand all | Expand 10 after
1007 syncer::BOOKMARKS); 1007 syncer::BOOKMARKS);
1008 } else { 1008 } else {
1009 context->set_native_model_sync_state(BEHIND); 1009 context->set_native_model_sync_state(BEHIND);
1010 } 1010 }
1011 } 1011 }
1012 } 1012 }
1013 return syncer::SyncError(); 1013 return syncer::SyncError();
1014 } 1014 }
1015 1015
1016 } // namespace sync_bookmarks 1016 } // namespace sync_bookmarks
OLDNEW
« 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