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

Unified Diff: third_party/protobuf/js/commonjs/test7/test7.proto

Issue 1983203003: Update third_party/protobuf to protobuf-v3.0.0-beta-3 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: owners Created 4 years, 7 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/commonjs/test6/test6.proto ('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/commonjs/test7/test7.proto
diff --git a/third_party/protobuf/js/test4.proto b/third_party/protobuf/js/commonjs/test7/test7.proto
similarity index 88%
copy from third_party/protobuf/js/test4.proto
copy to third_party/protobuf/js/commonjs/test7/test7.proto
index cf2451e9cbe483e1b06efd227f29f17e655077ce..f5574a3dd3f8bb6beaa254c0956c9f565079d83d 100644
--- a/third_party/protobuf/js/test4.proto
+++ b/third_party/protobuf/js/commonjs/test7/test7.proto
@@ -1,5 +1,5 @@
// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc. All rights reserved.
+// Copyright 2016 Google Inc. All rights reserved.
// https://developers.google.com/protocol-buffers/
//
// Redistribution and use in source and binary forms, with or without
@@ -28,15 +28,15 @@
// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-syntax = "proto2";
+syntax = "proto3";
option java_package = "com.google.apps.jspb.proto";
option java_multiple_files = true;
-package jspb.exttest;
+package jspb.test.framing;
-import "test3.proto";
+import "test6/test6.proto";
-extend TestExtensionsMessage {
- optional ExtensionMessage floating_msg_field_two = 103;
+message FramingMessage {
+ jspb.test.importing.ImportedMessage imported_message = 1;
}
« no previous file with comments | « third_party/protobuf/js/commonjs/test6/test6.proto ('k') | third_party/protobuf/js/debug.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698