| OLD | NEW |
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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 "base_transaction.h" | 5 #include "base_transaction.h" |
| 6 | 6 |
| 7 #include "chrome/browser/sync/syncable/directory_manager.h" | 7 #include "chrome/browser/sync/syncable/directory_manager.h" |
| 8 #include "chrome/browser/sync/util/cryptographer.h" | 8 #include "chrome/browser/sync/util/cryptographer.h" |
| 9 | 9 |
| 10 using browser_sync::Cryptographer; | 10 using browser_sync::Cryptographer; |
| 11 | 11 |
| 12 namespace sync_api { | 12 namespace sync_api { |
| 13 | 13 |
| 14 ////////////////////////////////////////////////////////////////////////// | 14 ////////////////////////////////////////////////////////////////////////// |
| 15 // BaseTransaction member definitions | 15 // BaseTransaction member definitions |
| 16 BaseTransaction::BaseTransaction(UserShare* share) | 16 BaseTransaction::BaseTransaction(UserShare* share) |
| 17 : lookup_(NULL) { | 17 : lookup_(NULL) { |
| 18 DCHECK(share && share->dir_manager.get()); | 18 DCHECK(share && share->dir_manager.get()); |
| 19 lookup_ = new syncable::ScopedDirLookup(share->dir_manager.get(), | 19 lookup_ = new syncable::ScopedDirLookup(share->dir_manager.get(), |
| 20 share->name); | 20 share->name); |
| 21 cryptographer_ = share->dir_manager->GetCryptographer(this); | 21 cryptographer_ = share->dir_manager->GetCryptographer(this); |
| 22 if (!(lookup_->good())) | 22 if (!(lookup_->good())) |
| 23 DCHECK(false) << "ScopedDirLookup failed on valid DirManager."; | 23 DCHECK(false) << "ScopedDirLookup failed on valid DirManager."; |
| 24 } | 24 } |
| 25 BaseTransaction::~BaseTransaction() { | 25 BaseTransaction::~BaseTransaction() { |
| 26 delete lookup_; | 26 delete lookup_; |
| 27 } | 27 } |
| 28 | 28 |
| 29 syncable::ModelEnumSet GetEncryptedTypes( | 29 syncable::ModelTypeSet GetEncryptedTypes( |
| 30 const sync_api::BaseTransaction* trans) { | 30 const sync_api::BaseTransaction* trans) { |
| 31 Cryptographer* cryptographer = trans->GetCryptographer(); | 31 Cryptographer* cryptographer = trans->GetCryptographer(); |
| 32 return cryptographer->GetEncryptedTypes(); | 32 return cryptographer->GetEncryptedTypes(); |
| 33 } | 33 } |
| 34 | 34 |
| 35 } // namespace sync_api | 35 } // namespace sync_api |
| OLD | NEW |