diff options
| author | Ben Murdoch <benm@google.com> | 2010-11-25 19:40:10 +0000 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2010-12-03 13:52:53 +0000 |
| commit | 4a5e2dc747d50c653511c68ccb2cfbfb740bd5a7 (patch) | |
| tree | 938665d93a11fe7a6d0124e3c1e020d1f9d3f947 /chrome/browser/sync/protocol/nigori_specifics.proto | |
| parent | 7c627d87728a355737862918d144f98f69406954 (diff) | |
| download | external_chromium-4a5e2dc747d50c653511c68ccb2cfbfb740bd5a7.zip external_chromium-4a5e2dc747d50c653511c68ccb2cfbfb740bd5a7.tar.gz external_chromium-4a5e2dc747d50c653511c68ccb2cfbfb740bd5a7.tar.bz2 | |
Merge Chromium at r66597: Initial merge by git.
Change-Id: I9639f8a997f90ec219573aa22a49f5dbde78cc7b
Diffstat (limited to 'chrome/browser/sync/protocol/nigori_specifics.proto')
| -rw-r--r-- | chrome/browser/sync/protocol/nigori_specifics.proto | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/chrome/browser/sync/protocol/nigori_specifics.proto b/chrome/browser/sync/protocol/nigori_specifics.proto index aa33ba6..e7458c6 100644 --- a/chrome/browser/sync/protocol/nigori_specifics.proto +++ b/chrome/browser/sync/protocol/nigori_specifics.proto @@ -28,6 +28,9 @@ message NigoriKeyBag { // Properties of nigori sync object. message NigoriSpecifics { optional EncryptedData encrypted = 1; + // True if |encrypted| is encrypted using a passphrase + // explicitly set by the user. + optional bool using_explicit_passphrase = 2; } extend EntitySpecifics { |