| 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 "sync/syncable/entry.h" | 5 #include "sync/syncable/entry.h" |
| 6 | 6 |
| 7 #include <iomanip> | 7 #include <iomanip> |
| 8 | 8 |
| 9 #include "net/base/escape.h" | 9 #include "net/base/escape.h" |
| 10 #include "sync/syncable/base_transaction.h" | 10 #include "sync/syncable/base_transaction.h" |
| 11 #include "sync/syncable/blob.h" | 11 #include "sync/syncable/blob.h" |
| 12 #include "sync/syncable/directory.h" | 12 #include "sync/syncable/directory.h" |
| 13 #include "sync/syncable/syncable_columns.h" | 13 #include "sync/syncable/syncable_columns.h" |
| 14 | 14 |
| 15 using std::string; | 15 using std::string; |
| 16 | 16 |
| 17 namespace syncer { |
| 17 namespace syncable { | 18 namespace syncable { |
| 18 | 19 |
| 19 Entry::Entry(BaseTransaction* trans, GetById, const Id& id) | 20 Entry::Entry(BaseTransaction* trans, GetById, const Id& id) |
| 20 : basetrans_(trans) { | 21 : basetrans_(trans) { |
| 21 kernel_ = trans->directory()->GetEntryById(id); | 22 kernel_ = trans->directory()->GetEntryById(id); |
| 22 } | 23 } |
| 23 | 24 |
| 24 Entry::Entry(BaseTransaction* trans, GetByClientTag, const string& tag) | 25 Entry::Entry(BaseTransaction* trans, GetByClientTag, const string& tag) |
| 25 : basetrans_(trans) { | 26 : basetrans_(trans) { |
| 26 kernel_ = trans->directory()->GetEntryByClientTag(tag); | 27 kernel_ = trans->directory()->GetEntryByClientTag(tag); |
| (...skipping 107 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 134 } | 135 } |
| 135 os << "TempFlags: "; | 136 os << "TempFlags: "; |
| 136 for ( ; i < BIT_TEMPS_END; ++i) { | 137 for ( ; i < BIT_TEMPS_END; ++i) { |
| 137 if (kernel->ref(static_cast<BitTemp>(i))) | 138 if (kernel->ref(static_cast<BitTemp>(i))) |
| 138 os << "#" << i - BIT_TEMPS_BEGIN << ", "; | 139 os << "#" << i - BIT_TEMPS_BEGIN << ", "; |
| 139 } | 140 } |
| 140 return os; | 141 return os; |
| 141 } | 142 } |
| 142 | 143 |
| 143 } // namespace syncable | 144 } // namespace syncable |
| 145 } // namespace syncer |
| OLD | NEW |