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

Side by Side Diff: third_party/protobuf/src/google/protobuf/util/json_format_proto3.proto

Issue 2495533002: third_party/protobuf: Update to HEAD (83d681ee2c) (Closed)
Patch Set: Make chrome settings proto generated file a component Created 4 years 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
OLDNEW
1 // Protocol Buffers - Google's data interchange format 1 // Protocol Buffers - Google's data interchange format
2 // Copyright 2008 Google Inc. All rights reserved. 2 // Copyright 2008 Google Inc. All rights reserved.
3 // https://developers.google.com/protocol-buffers/ 3 // https://developers.google.com/protocol-buffers/
4 // 4 //
5 // Redistribution and use in source and binary forms, with or without 5 // Redistribution and use in source and binary forms, with or without
6 // modification, are permitted provided that the following conditions are 6 // modification, are permitted provided that the following conditions are
7 // met: 7 // met:
8 // 8 //
9 // * Redistributions of source code must retain the above copyright 9 // * Redistributions of source code must retain the above copyright
10 // notice, this list of conditions and the following disclaimer. 10 // notice, this list of conditions and the following disclaimer.
(...skipping 21 matching lines...) Expand all
32 32
33 package proto3; 33 package proto3;
34 34
35 35
36 import "google/protobuf/duration.proto"; 36 import "google/protobuf/duration.proto";
37 import "google/protobuf/timestamp.proto"; 37 import "google/protobuf/timestamp.proto";
38 import "google/protobuf/wrappers.proto"; 38 import "google/protobuf/wrappers.proto";
39 import "google/protobuf/struct.proto"; 39 import "google/protobuf/struct.proto";
40 import "google/protobuf/any.proto"; 40 import "google/protobuf/any.proto";
41 import "google/protobuf/field_mask.proto"; 41 import "google/protobuf/field_mask.proto";
42 import "google/protobuf/unittest.proto";
42 43
43 enum EnumType { 44 enum EnumType {
44 FOO = 0; 45 FOO = 0;
45 BAR = 1; 46 BAR = 1;
46 } 47 }
47 48
48 message MessageType { 49 message MessageType {
49 int32 value = 1; 50 int32 value = 1;
50 } 51 }
51 52
(...skipping 115 matching lines...) Expand 10 before | Expand all | Expand 10 after
167 } 168 }
168 169
169 message TestBoolValue { 170 message TestBoolValue {
170 bool bool_value = 1; 171 bool bool_value = 1;
171 map<bool, int32> bool_map = 2; 172 map<bool, int32> bool_map = 2;
172 } 173 }
173 174
174 message TestCustomJsonName { 175 message TestCustomJsonName {
175 int32 value = 1 [json_name = "@value"]; 176 int32 value = 1 [json_name = "@value"];
176 } 177 }
178
179 message TestExtensions {
180 .protobuf_unittest.TestAllExtensions extensions = 1;
181 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698