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/internal_api/public/base_transaction.h" | 5 #include "components/sync/core/base_transaction.h" |
6 | 6 |
7 #include "sync/syncable/directory.h" | 7 #include "components/sync/base/cryptographer.h" |
8 #include "sync/syncable/nigori_handler.h" | 8 #include "components/sync/syncable/directory.h" |
9 #include "sync/util/cryptographer.h" | 9 #include "components/sync/syncable/nigori_handler.h" |
10 | 10 |
11 namespace syncer { | 11 namespace syncer { |
12 | 12 |
13 ////////////////////////////////////////////////////////////////////////// | 13 ////////////////////////////////////////////////////////////////////////// |
14 // BaseTransaction member definitions | 14 // BaseTransaction member definitions |
15 BaseTransaction::BaseTransaction(UserShare* share) | 15 BaseTransaction::BaseTransaction(UserShare* share) : user_share_(share) { |
16 : user_share_(share) { | |
17 DCHECK(share && share->directory.get()); | 16 DCHECK(share && share->directory.get()); |
18 } | 17 } |
19 | 18 |
20 BaseTransaction::~BaseTransaction() { | 19 BaseTransaction::~BaseTransaction() {} |
21 } | |
22 | 20 |
23 Cryptographer* BaseTransaction::GetCryptographer() const { | 21 Cryptographer* BaseTransaction::GetCryptographer() const { |
24 return GetDirectory()->GetCryptographer(this->GetWrappedTrans()); | 22 return GetDirectory()->GetCryptographer(this->GetWrappedTrans()); |
25 } | 23 } |
26 | 24 |
27 ModelTypeSet BaseTransaction::GetEncryptedTypes() const { | 25 ModelTypeSet BaseTransaction::GetEncryptedTypes() const { |
28 syncable::NigoriHandler* nigori_handler = | 26 syncable::NigoriHandler* nigori_handler = GetDirectory()->GetNigoriHandler(); |
29 GetDirectory()->GetNigoriHandler(); | 27 return nigori_handler |
30 return nigori_handler ? | 28 ? nigori_handler->GetEncryptedTypes(this->GetWrappedTrans()) |
31 nigori_handler->GetEncryptedTypes(this->GetWrappedTrans()) : | 29 : ModelTypeSet(); |
32 ModelTypeSet(); | |
33 } | 30 } |
34 | 31 |
35 } // namespace syncer | 32 } // namespace syncer |
OLD | NEW |