third_party/protobuf/src/google/protobuf/util/json_format_proto3.proto - Issue 2495533002: third_party/protobuf: Update to HEAD (83d681ee2c)

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified 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 side-by-side diff with in-line comments

Download patch

« no previous file with comments | « third_party/protobuf/src/google/protobuf/util/internal/utility.cc ('k') | third_party/protobuf/src/google/protobuf/util/json_util.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/protobuf/src/google/protobuf/util/json_format_proto3.proto

diff --git a/third_party/protobuf/src/google/protobuf/util/json_format_proto3.proto b/third_party/protobuf/src/google/protobuf/util/json_format_proto3.proto

index a1e24c1831823cc6e62d0f7c7523dca1227cdc4f..3835b30eb951f582c8cc3748aaf30c30be1a825e 100644

--- a/third_party/protobuf/src/google/protobuf/util/json_format_proto3.proto

+++ b/third_party/protobuf/src/google/protobuf/util/json_format_proto3.proto

@@ -39,6 +39,7 @@ import "google/protobuf/wrappers.proto";

import "google/protobuf/struct.proto";

import "google/protobuf/any.proto";

import "google/protobuf/field_mask.proto";

+import "google/protobuf/unittest.proto";

enum EnumType {

FOO = 0;

@@ -174,3 +175,7 @@ message TestBoolValue {

message TestCustomJsonName {

int32 value = 1 [json_name = "@value"];

}

+message TestExtensions {

+ .protobuf_unittest.TestAllExtensions extensions = 1;