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

Unified Diff: third_party/protobuf/java/core/src/main/java/com/google/protobuf/Extension.java

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
Index: third_party/protobuf/java/core/src/main/java/com/google/protobuf/Extension.java
diff --git a/third_party/protobuf/java/src/main/java/com/google/protobuf/Extension.java b/third_party/protobuf/java/core/src/main/java/com/google/protobuf/Extension.java
similarity index 99%
rename from third_party/protobuf/java/src/main/java/com/google/protobuf/Extension.java
rename to third_party/protobuf/java/core/src/main/java/com/google/protobuf/Extension.java
index 68d29f33d47b43ffaa1253903a5e12b1c3bb6f41..08ec5b45416cc0d5afff39823d5134df34e784a5 100644
--- a/third_party/protobuf/java/src/main/java/com/google/protobuf/Extension.java
+++ b/third_party/protobuf/java/core/src/main/java/com/google/protobuf/Extension.java
@@ -42,6 +42,7 @@ public abstract class Extension<ContainingType extends MessageLite, Type>
public abstract Descriptors.FieldDescriptor getDescriptor();
/** Returns whether or not this extension is a Lite Extension. */
+ @Override
final boolean isLite() {
return false;
}

Powered by Google App Engine
This is Rietveld 408576698