| 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 #ifndef SYNC_UTIL_CRYPTOGRAPHER_H_ | 5 #ifndef SYNC_UTIL_CRYPTOGRAPHER_H_ |
| 6 #define SYNC_UTIL_CRYPTOGRAPHER_H_ | 6 #define SYNC_UTIL_CRYPTOGRAPHER_H_ |
| 7 | 7 |
| 8 #include <map> | 8 #include <map> |
| 9 #include <string> | 9 #include <string> |
| 10 | 10 |
| 11 #include "base/macros.h" |
| 11 #include "base/memory/linked_ptr.h" | 12 #include "base/memory/linked_ptr.h" |
| 12 #include "base/memory/scoped_ptr.h" | 13 #include "base/memory/scoped_ptr.h" |
| 13 #include "sync/base/sync_export.h" | 14 #include "sync/base/sync_export.h" |
| 14 #include "sync/protocol/encryption.pb.h" | 15 #include "sync/protocol/encryption.pb.h" |
| 15 #include "sync/util/nigori.h" | 16 #include "sync/util/nigori.h" |
| 16 | 17 |
| 17 namespace sync_pb { | 18 namespace sync_pb { |
| 18 class NigoriKeyBag; | 19 class NigoriKeyBag; |
| 19 class NigoriSpecifics; | 20 class NigoriSpecifics; |
| 20 } | 21 } |
| (...skipping 191 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 212 std::string default_nigori_name_; | 213 std::string default_nigori_name_; |
| 213 | 214 |
| 214 scoped_ptr<sync_pb::EncryptedData> pending_keys_; | 215 scoped_ptr<sync_pb::EncryptedData> pending_keys_; |
| 215 | 216 |
| 216 DISALLOW_ASSIGN(Cryptographer); | 217 DISALLOW_ASSIGN(Cryptographer); |
| 217 }; | 218 }; |
| 218 | 219 |
| 219 } // namespace syncer | 220 } // namespace syncer |
| 220 | 221 |
| 221 #endif // SYNC_UTIL_CRYPTOGRAPHER_H_ | 222 #endif // SYNC_UTIL_CRYPTOGRAPHER_H_ |
| OLD | NEW |