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 "chrome/browser/sync/glue/bookmark_model_associator.h" | 5 #include "chrome/browser/sync/glue/bookmark_model_associator.h" |
6 | 6 |
7 #include <stack> | 7 #include <stack> |
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 195 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
206 | 206 |
207 const BookmarkNode* BookmarkNodeIdIndex::Find(int64 id) const { | 207 const BookmarkNode* BookmarkNodeIdIndex::Find(int64 id) const { |
208 BookmarkIdMap::const_iterator iter = node_index_.find(id); | 208 BookmarkIdMap::const_iterator iter = node_index_.find(id); |
209 return iter == node_index_.end() ? NULL : iter->second; | 209 return iter == node_index_.end() ? NULL : iter->second; |
210 } | 210 } |
211 | 211 |
212 BookmarkModelAssociator::BookmarkModelAssociator( | 212 BookmarkModelAssociator::BookmarkModelAssociator( |
213 BookmarkModel* bookmark_model, | 213 BookmarkModel* bookmark_model, |
214 Profile* profile, | 214 Profile* profile, |
215 syncer::UserShare* user_share, | 215 syncer::UserShare* user_share, |
216 DataTypeErrorHandler* unrecoverable_error_handler, | 216 sync_driver::DataTypeErrorHandler* unrecoverable_error_handler, |
217 bool expect_mobile_bookmarks_folder) | 217 bool expect_mobile_bookmarks_folder) |
218 : bookmark_model_(bookmark_model), | 218 : bookmark_model_(bookmark_model), |
219 profile_(profile), | 219 profile_(profile), |
220 user_share_(user_share), | 220 user_share_(user_share), |
221 unrecoverable_error_handler_(unrecoverable_error_handler), | 221 unrecoverable_error_handler_(unrecoverable_error_handler), |
222 expect_mobile_bookmarks_folder_(expect_mobile_bookmarks_folder), | 222 expect_mobile_bookmarks_folder_(expect_mobile_bookmarks_folder), |
223 weak_factory_(this) { | 223 weak_factory_(this) { |
224 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); | 224 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); |
225 DCHECK(bookmark_model_); | 225 DCHECK(bookmark_model_); |
226 DCHECK(user_share_); | 226 DCHECK(user_share_); |
(...skipping 556 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
783 syncer::SyncError::PERSISTENCE_ERROR, | 783 syncer::SyncError::PERSISTENCE_ERROR, |
784 message, | 784 message, |
785 syncer::BOOKMARKS); | 785 syncer::BOOKMARKS); |
786 } | 786 } |
787 } | 787 } |
788 } | 788 } |
789 return syncer::SyncError(); | 789 return syncer::SyncError(); |
790 } | 790 } |
791 | 791 |
792 } // namespace browser_sync | 792 } // namespace browser_sync |
OLD | NEW |