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/core/read_node.h" | 5 #include "components/sync/syncable/read_node.h" |
6 | 6 |
7 #include "base/logging.h" | 7 #include "base/logging.h" |
8 #include "components/sync/core/base_transaction.h" | 8 #include "components/sync/syncable/base_transaction.h" |
9 #include "components/sync/syncable/entry.h" | 9 #include "components/sync/syncable/entry.h" |
10 #include "components/sync/syncable/syncable_base_transaction.h" | 10 #include "components/sync/syncable/syncable_base_transaction.h" |
11 #include "components/sync/syncable/syncable_util.h" | 11 #include "components/sync/syncable/syncable_util.h" |
12 | 12 |
13 namespace syncer { | 13 namespace syncer { |
14 | 14 |
15 ////////////////////////////////////////////////////////////////////////// | 15 ////////////////////////////////////////////////////////////////////////// |
16 // ReadNode member definitions | 16 // ReadNode member definitions |
17 ReadNode::ReadNode(const BaseTransaction* transaction) | 17 ReadNode::ReadNode(const BaseTransaction* transaction) |
18 : entry_(NULL), transaction_(transaction) { | 18 : entry_(NULL), transaction_(transaction) { |
(...skipping 90 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
109 if (entry_->GetIsDel()) | 109 if (entry_->GetIsDel()) |
110 return INIT_FAILED_ENTRY_IS_DEL; | 110 return INIT_FAILED_ENTRY_IS_DEL; |
111 ModelType found_model_type = GetModelType(); | 111 ModelType found_model_type = GetModelType(); |
112 LOG_IF(WARNING, found_model_type == UNSPECIFIED || | 112 LOG_IF(WARNING, found_model_type == UNSPECIFIED || |
113 found_model_type == TOP_LEVEL_FOLDER) | 113 found_model_type == TOP_LEVEL_FOLDER) |
114 << "SyncAPI InitTypeRoot referencing unusually typed object."; | 114 << "SyncAPI InitTypeRoot referencing unusually typed object."; |
115 return DecryptIfNecessary() ? INIT_OK : INIT_FAILED_DECRYPT_IF_NECESSARY; | 115 return DecryptIfNecessary() ? INIT_OK : INIT_FAILED_DECRYPT_IF_NECESSARY; |
116 } | 116 } |
117 | 117 |
118 } // namespace syncer | 118 } // namespace syncer |
OLD | NEW |