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

Unified Diff: third_party/protobuf/js/data.proto

Issue 1842653006: Update //third_party/protobuf to version 3. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: merge Created 4 years, 8 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « third_party/protobuf/js/binary/writer_test.js ('k') | third_party/protobuf/js/debug.js » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/protobuf/js/data.proto
diff --git a/third_party/protobuf/src/google/protobuf/unittest_no_generic_services.proto b/third_party/protobuf/js/data.proto
similarity index 79%
copy from third_party/protobuf/src/google/protobuf/unittest_no_generic_services.proto
copy to third_party/protobuf/js/data.proto
index cffb4122c5c4f9d2e63a09d70c3784614617d88d..74a8a994c75f01c825ad9009e8f0da7c2ac3deff 100644
--- a/third_party/protobuf/src/google/protobuf/unittest_no_generic_services.proto
+++ b/third_party/protobuf/js/data.proto
@@ -1,6 +1,6 @@
// Protocol Buffers - Google's data interchange format
// Copyright 2008 Google Inc. All rights reserved.
-// http://code.google.com/p/protobuf/
+// https://developers.google.com/protocol-buffers/
//
// Redistribution and use in source and binary forms, with or without
// modification, are permitted provided that the following conditions are
@@ -28,25 +28,24 @@
// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-// Author: kenton@google.com (Kenton Varda)
+// Author: mwr@google.com (Mark Rawling)
-package google.protobuf.no_generic_services_test;
+syntax = "proto2";
-// *_generic_services are false by default.
+option java_package = "com.google.apps.jspb.proto";
+option java_multiple_files = true;
-message TestMessage {
- optional int32 a = 1;
- extensions 1000 to max;
-}
+package jspb.test;
-enum TestEnum {
- FOO = 1;
+// legacy data, must be nested
+message data {
+ message NestedData {
+ required string str = 1;
+ }
}
-extend TestMessage {
- optional int32 test_extension = 1000;
+// new data, does not require nesting
+message UnnestedData {
+ required string str = 1;
}
-service TestService {
- rpc Foo(TestMessage) returns(TestMessage);
-}
« no previous file with comments | « third_party/protobuf/js/binary/writer_test.js ('k') | third_party/protobuf/js/debug.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698