Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(235)

Side by Side Diff: sync/protocol/nigori_specifics.proto

Issue 11441005: Create a fresh sync datatype for Synced Notifications (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Fix merge conflict in prolto_value_conversions.h Created 7 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « sync/internal_api/public/base/model_type.h ('k') | sync/protocol/proto_value_conversions.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 // Sync protocol datatype extension for nigori keys. 5 // Sync protocol datatype extension for nigori keys.
6 6
7 // Update proto_value_conversions{.h,.cc,_unittest.cc} if you change 7 // Update proto_value_conversions{.h,.cc,_unittest.cc} if you change
8 // any fields in this file. 8 // any fields in this file.
9 9
10 syntax = "proto2"; 10 syntax = "proto2";
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
46 // optional bool deprecated_encrypt_typed_urls = 8; 46 // optional bool deprecated_encrypt_typed_urls = 8;
47 // optional bool deprecated_encrypt_extensions = 9; 47 // optional bool deprecated_encrypt_extensions = 9;
48 // optional bool deprecated_encrypt_sessions = 10; 48 // optional bool deprecated_encrypt_sessions = 10;
49 // optional bool deprecated_encrypt_apps = 11; 49 // optional bool deprecated_encrypt_apps = 11;
50 // optional bool deprecated_encrypt_search_engines = 12; 50 // optional bool deprecated_encrypt_search_engines = 12;
51 51
52 // Booleans corresponding to whether a datatype should be encrypted. 52 // Booleans corresponding to whether a datatype should be encrypted.
53 // Passwords are always encrypted, so we don't need a field here. 53 // Passwords are always encrypted, so we don't need a field here.
54 // History delete directives need to be consumable by the server, and 54 // History delete directives need to be consumable by the server, and
55 // thus can't be encrypted. 55 // thus can't be encrypted.
56 // Synced Notifications need to be consumed by the server (the read flag)
57 // and thus can't be encrypted.
56 optional bool encrypt_bookmarks = 13; 58 optional bool encrypt_bookmarks = 13;
57 optional bool encrypt_preferences = 14; 59 optional bool encrypt_preferences = 14;
58 optional bool encrypt_autofill_profile = 15; 60 optional bool encrypt_autofill_profile = 15;
59 optional bool encrypt_autofill = 16; 61 optional bool encrypt_autofill = 16;
60 optional bool encrypt_themes = 17; 62 optional bool encrypt_themes = 17;
61 optional bool encrypt_typed_urls = 18; 63 optional bool encrypt_typed_urls = 18;
62 optional bool encrypt_extensions = 19; 64 optional bool encrypt_extensions = 19;
63 optional bool encrypt_sessions = 20; 65 optional bool encrypt_sessions = 20;
64 optional bool encrypt_apps = 21; 66 optional bool encrypt_apps = 21;
65 optional bool encrypt_search_engines = 22; 67 optional bool encrypt_search_engines = 22;
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
105 // The time (in epoch milliseconds) at which the keystore migration was 107 // The time (in epoch milliseconds) at which the keystore migration was
106 // performed. 108 // performed.
107 optional int64 keystore_migration_time = 32; 109 optional int64 keystore_migration_time = 32;
108 110
109 // The time (in epoch milliseconds) at which a custom passphrase was set. 111 // The time (in epoch milliseconds) at which a custom passphrase was set.
110 // Note: this field may not be set if the custom passphrase was applied before 112 // Note: this field may not be set if the custom passphrase was applied before
111 // this field was introduced. 113 // this field was introduced.
112 optional int64 custom_passphrase_time = 33; 114 optional int64 custom_passphrase_time = 33;
113 } 115 }
114 116
OLDNEW
« no previous file with comments | « sync/internal_api/public/base/model_type.h ('k') | sync/protocol/proto_value_conversions.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698