OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 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" |
11 #include "base/hash_tables.h" | 11 #include "base/hash_tables.h" |
12 #include "base/location.h" | 12 #include "base/location.h" |
13 #include "base/message_loop.h" | 13 #include "base/message_loop.h" |
14 #include "base/utf_string_conversions.h" | 14 #include "base/utf_string_conversions.h" |
15 #include "chrome/browser/bookmarks/bookmark_model.h" | 15 #include "chrome/browser/bookmarks/bookmark_model.h" |
16 #include "chrome/browser/profiles/profile.h" | 16 #include "chrome/browser/profiles/profile.h" |
17 #include "chrome/browser/sync/api/sync_error.h" | 17 #include "chrome/browser/sync/api/sync_error.h" |
18 #include "chrome/browser/sync/glue/bookmark_change_processor.h" | 18 #include "chrome/browser/sync/glue/bookmark_change_processor.h" |
19 #include "chrome/browser/sync/internal_api/read_node.h" | |
20 #include "chrome/browser/sync/internal_api/read_transaction.h" | |
21 #include "chrome/browser/sync/internal_api/write_node.h" | |
22 #include "chrome/browser/sync/internal_api/write_transaction.h" | |
23 #include "content/public/browser/browser_thread.h" | 19 #include "content/public/browser/browser_thread.h" |
| 20 #include "sync/internal_api/read_node.h" |
| 21 #include "sync/internal_api/read_transaction.h" |
| 22 #include "sync/internal_api/write_node.h" |
| 23 #include "sync/internal_api/write_transaction.h" |
24 #include "sync/util/cryptographer.h" | 24 #include "sync/util/cryptographer.h" |
25 | 25 |
26 using content::BrowserThread; | 26 using content::BrowserThread; |
27 | 27 |
28 namespace browser_sync { | 28 namespace browser_sync { |
29 | 29 |
30 // The sync protocol identifies top-level entities by means of well-known tags, | 30 // The sync protocol identifies top-level entities by means of well-known tags, |
31 // which should not be confused with titles. Each tag corresponds to a | 31 // which should not be confused with titles. Each tag corresponds to a |
32 // singleton instance of a particular top-level node in a user's share; the | 32 // singleton instance of a particular top-level node in a user's share; the |
33 // tags are consistent across users. The tags allow us to locate the specific | 33 // tags are consistent across users. The tags allow us to locate the specific |
(...skipping 628 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
662 bool BookmarkModelAssociator::CryptoReadyIfNecessary() { | 662 bool BookmarkModelAssociator::CryptoReadyIfNecessary() { |
663 // We only access the cryptographer while holding a transaction. | 663 // We only access the cryptographer while holding a transaction. |
664 sync_api::ReadTransaction trans(FROM_HERE, user_share_); | 664 sync_api::ReadTransaction trans(FROM_HERE, user_share_); |
665 const syncable::ModelTypeSet encrypted_types = | 665 const syncable::ModelTypeSet encrypted_types = |
666 sync_api::GetEncryptedTypes(&trans); | 666 sync_api::GetEncryptedTypes(&trans); |
667 return !encrypted_types.Has(syncable::BOOKMARKS) || | 667 return !encrypted_types.Has(syncable::BOOKMARKS) || |
668 trans.GetCryptographer()->is_ready(); | 668 trans.GetCryptographer()->is_ready(); |
669 } | 669 } |
670 | 670 |
671 } // namespace browser_sync | 671 } // namespace browser_sync |
OLD | NEW |