| 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_NIGORI_H_ | 5 #ifndef SYNC_UTIL_NIGORI_H_ |
| 6 #define SYNC_UTIL_NIGORI_H_ | 6 #define SYNC_UTIL_NIGORI_H_ |
| 7 | 7 |
| 8 #include <stddef.h> |
| 9 |
| 8 #include <string> | 10 #include <string> |
| 9 | 11 |
| 10 #include "base/memory/scoped_ptr.h" | 12 #include "base/memory/scoped_ptr.h" |
| 11 #include "sync/base/sync_export.h" | 13 #include "sync/base/sync_export.h" |
| 12 | 14 |
| 13 namespace crypto { | 15 namespace crypto { |
| 14 class SymmetricKey; | 16 class SymmetricKey; |
| 15 } // namespace crypto | 17 } // namespace crypto |
| 16 | 18 |
| 17 namespace syncer { | 19 namespace syncer { |
| (...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 77 | 79 |
| 78 private: | 80 private: |
| 79 scoped_ptr<crypto::SymmetricKey> user_key_; | 81 scoped_ptr<crypto::SymmetricKey> user_key_; |
| 80 scoped_ptr<crypto::SymmetricKey> encryption_key_; | 82 scoped_ptr<crypto::SymmetricKey> encryption_key_; |
| 81 scoped_ptr<crypto::SymmetricKey> mac_key_; | 83 scoped_ptr<crypto::SymmetricKey> mac_key_; |
| 82 }; | 84 }; |
| 83 | 85 |
| 84 } // namespace syncer | 86 } // namespace syncer |
| 85 | 87 |
| 86 #endif // SYNC_UTIL_NIGORI_H_ | 88 #endif // SYNC_UTIL_NIGORI_H_ |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 1545553003:
Switch to standard integer types in sync/. (Closed)
Base URL: https://chromium.googlesource.com/chromium/src.git@master