| 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 19 matching lines...) Expand all Loading... |
| 30 #include "sync/internal_api/public/read_node.h" | 30 #include "sync/internal_api/public/read_node.h" |
| 31 #include "sync/internal_api/public/read_transaction.h" | 31 #include "sync/internal_api/public/read_transaction.h" |
| 32 #include "sync/internal_api/public/write_node.h" | 32 #include "sync/internal_api/public/write_node.h" |
| 33 #include "sync/internal_api/public/write_transaction.h" | 33 #include "sync/internal_api/public/write_transaction.h" |
| 34 #include "sync/internal_api/syncapi_internal.h" | 34 #include "sync/internal_api/syncapi_internal.h" |
| 35 #include "sync/syncable/syncable_write_transaction.h" | 35 #include "sync/syncable/syncable_write_transaction.h" |
| 36 #include "sync/util/cryptographer.h" | 36 #include "sync/util/cryptographer.h" |
| 37 #include "sync/util/data_type_histogram.h" | 37 #include "sync/util/data_type_histogram.h" |
| 38 | 38 |
| 39 using bookmarks::BookmarkModel; | 39 using bookmarks::BookmarkModel; |
| 40 using bookmarks::BookmarkNode; |
| 40 using content::BrowserThread; | 41 using content::BrowserThread; |
| 41 | 42 |
| 42 namespace browser_sync { | 43 namespace browser_sync { |
| 43 | 44 |
| 44 // 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, |
| 45 // 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 |
| 46 // singleton instance of a particular top-level node in a user's share; the | 47 // singleton instance of a particular top-level node in a user's share; the |
| 47 // tags are consistent across users. The tags allow us to locate the specific | 48 // tags are consistent across users. The tags allow us to locate the specific |
| 48 // folders whose contents we care about synchronizing, without having to do a | 49 // folders whose contents we care about synchronizing, without having to do a |
| 49 // lookup by name or path. The tags should not be made user-visible. | 50 // lookup by name or path. The tags should not be made user-visible. |
| (...skipping 736 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 786 syncer::SyncError::PERSISTENCE_ERROR, | 787 syncer::SyncError::PERSISTENCE_ERROR, |
| 787 message, | 788 message, |
| 788 syncer::BOOKMARKS); | 789 syncer::BOOKMARKS); |
| 789 } | 790 } |
| 790 } | 791 } |
| 791 } | 792 } |
| 792 return syncer::SyncError(); | 793 return syncer::SyncError(); |
| 793 } | 794 } |
| 794 | 795 |
| 795 } // namespace browser_sync | 796 } // namespace browser_sync |
| OLD | NEW |