OLD | NEW |
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" |
(...skipping 290 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
301 return syncer_merge_result_->pre_association_version(); | 301 return syncer_merge_result_->pre_association_version(); |
302 } | 302 } |
303 | 303 |
304 void BookmarkModelAssociator::Context::MarkForVersionUpdate( | 304 void BookmarkModelAssociator::Context::MarkForVersionUpdate( |
305 const bookmarks::BookmarkNode* node) { | 305 const bookmarks::BookmarkNode* node) { |
306 bookmarks_for_version_update_.push_back(node); | 306 bookmarks_for_version_update_.push_back(node); |
307 } | 307 } |
308 | 308 |
309 BookmarkModelAssociator::BookmarkModelAssociator( | 309 BookmarkModelAssociator::BookmarkModelAssociator( |
310 BookmarkModel* bookmark_model, | 310 BookmarkModel* bookmark_model, |
311 sync_driver::SyncClient* sync_client, | 311 syncer::SyncClient* sync_client, |
312 syncer::UserShare* user_share, | 312 syncer::UserShare* user_share, |
313 std::unique_ptr<syncer::DataTypeErrorHandler> unrecoverable_error_handler, | 313 std::unique_ptr<syncer::DataTypeErrorHandler> unrecoverable_error_handler, |
314 bool expect_mobile_bookmarks_folder) | 314 bool expect_mobile_bookmarks_folder) |
315 : bookmark_model_(bookmark_model), | 315 : bookmark_model_(bookmark_model), |
316 sync_client_(sync_client), | 316 sync_client_(sync_client), |
317 user_share_(user_share), | 317 user_share_(user_share), |
318 unrecoverable_error_handler_(std::move(unrecoverable_error_handler)), | 318 unrecoverable_error_handler_(std::move(unrecoverable_error_handler)), |
319 expect_mobile_bookmarks_folder_(expect_mobile_bookmarks_folder), | 319 expect_mobile_bookmarks_folder_(expect_mobile_bookmarks_folder), |
320 weak_factory_(this) { | 320 weak_factory_(this) { |
321 DCHECK(bookmark_model_); | 321 DCHECK(bookmark_model_); |
(...skipping 687 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
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 sync_bookmarks | 1018 } // namespace sync_bookmarks |
OLD | NEW |