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/session_model_associator.h" | 5 #include "chrome/browser/sync/glue/session_model_associator.h" |
6 | 6 |
7 #include <algorithm> | 7 #include <algorithm> |
8 #include <set> | 8 #include <set> |
9 #include <utility> | 9 #include <utility> |
10 | 10 |
(...skipping 11 matching lines...) Expand all Loading... |
22 #include "chrome/browser/sync/glue/synced_window_delegate.h" | 22 #include "chrome/browser/sync/glue/synced_window_delegate.h" |
23 #include "chrome/browser/sync/profile_sync_service.h" | 23 #include "chrome/browser/sync/profile_sync_service.h" |
24 #include "chrome/common/chrome_notification_types.h" | 24 #include "chrome/common/chrome_notification_types.h" |
25 #include "chrome/common/chrome_switches.h" | 25 #include "chrome/common/chrome_switches.h" |
26 #include "chrome/common/pref_names.h" | 26 #include "chrome/common/pref_names.h" |
27 #include "chrome/common/url_constants.h" | 27 #include "chrome/common/url_constants.h" |
28 #include "content/public/browser/navigation_entry.h" | 28 #include "content/public/browser/navigation_entry.h" |
29 #include "content/public/browser/notification_details.h" | 29 #include "content/public/browser/notification_details.h" |
30 #include "content/public/browser/notification_service.h" | 30 #include "content/public/browser/notification_service.h" |
31 #include "sync/api/sync_error.h" | 31 #include "sync/api/sync_error.h" |
| 32 #include "sync/internal_api/public/read_node.h" |
| 33 #include "sync/internal_api/public/read_transaction.h" |
32 #include "sync/internal_api/public/syncable/model_type.h" | 34 #include "sync/internal_api/public/syncable/model_type.h" |
33 #include "sync/internal_api/public/syncable/model_type_payload_map.h" | 35 #include "sync/internal_api/public/syncable/model_type_payload_map.h" |
34 #include "sync/internal_api/read_node.h" | 36 #include "sync/internal_api/public/write_node.h" |
35 #include "sync/internal_api/read_transaction.h" | 37 #include "sync/internal_api/public/write_transaction.h" |
36 #include "sync/internal_api/write_node.h" | |
37 #include "sync/internal_api/write_transaction.h" | |
38 #include "sync/protocol/session_specifics.pb.h" | 38 #include "sync/protocol/session_specifics.pb.h" |
39 #include "sync/syncable/syncable.h" | 39 #include "sync/syncable/syncable.h" |
40 #include "sync/util/get_session_name.h" | 40 #include "sync/util/get_session_name.h" |
41 #include "sync/util/time.h" | 41 #include "sync/util/time.h" |
42 #if defined(OS_LINUX) | 42 #if defined(OS_LINUX) |
43 #include "base/linux_util.h" | 43 #include "base/linux_util.h" |
44 #elif defined(OS_WIN) | 44 #elif defined(OS_WIN) |
45 #include <windows.h> | 45 #include <windows.h> |
46 #elif defined(OS_ANDROID) | 46 #elif defined(OS_ANDROID) |
47 #include "sync/util/session_utils_android.h" | 47 #include "sync/util/session_utils_android.h" |
(...skipping 1526 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1574 bool SessionModelAssociator::CryptoReadyIfNecessary() { | 1574 bool SessionModelAssociator::CryptoReadyIfNecessary() { |
1575 // We only access the cryptographer while holding a transaction. | 1575 // We only access the cryptographer while holding a transaction. |
1576 sync_api::ReadTransaction trans(FROM_HERE, sync_service_->GetUserShare()); | 1576 sync_api::ReadTransaction trans(FROM_HERE, sync_service_->GetUserShare()); |
1577 const syncable::ModelTypeSet encrypted_types = | 1577 const syncable::ModelTypeSet encrypted_types = |
1578 sync_api::GetEncryptedTypes(&trans); | 1578 sync_api::GetEncryptedTypes(&trans); |
1579 return !encrypted_types.Has(SESSIONS) || | 1579 return !encrypted_types.Has(SESSIONS) || |
1580 sync_service_->IsCryptographerReady(&trans); | 1580 sync_service_->IsCryptographerReady(&trans); |
1581 } | 1581 } |
1582 | 1582 |
1583 } // namespace browser_sync | 1583 } // namespace browser_sync |
OLD | NEW |