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

Unified Diff: base/json/json_value_converter.h

Issue 611153004: replace OVERRIDE and FINAL with override and final in base/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: CC_ -> BASE_ Created 6 years, 2 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 | « base/json/json_string_value_serializer.h ('k') | base/json/json_value_serializer_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: base/json/json_value_converter.h
diff --git a/base/json/json_value_converter.h b/base/json/json_value_converter.h
index cf3c74f0c7599a2d074ae9c2408a74a85f277100..f049d9a858836ba6babc468dd424d96b0723bbe0 100644
--- a/base/json/json_value_converter.h
+++ b/base/json/json_value_converter.h
@@ -123,7 +123,7 @@ class FieldConverter : public FieldConverterBase<StructType> {
}
virtual bool ConvertField(
- const base::Value& value, StructType* dst) const OVERRIDE {
+ const base::Value& value, StructType* dst) const override {
return value_converter_->Convert(value, &(dst->*field_pointer_));
}
@@ -141,7 +141,7 @@ class BasicValueConverter<int> : public ValueConverter<int> {
public:
BasicValueConverter() {}
- virtual bool Convert(const base::Value& value, int* field) const OVERRIDE {
+ virtual bool Convert(const base::Value& value, int* field) const override {
return value.GetAsInteger(field);
}
@@ -155,7 +155,7 @@ class BasicValueConverter<std::string> : public ValueConverter<std::string> {
BasicValueConverter() {}
virtual bool Convert(
- const base::Value& value, std::string* field) const OVERRIDE {
+ const base::Value& value, std::string* field) const override {
return value.GetAsString(field);
}
@@ -169,7 +169,7 @@ class BasicValueConverter<string16> : public ValueConverter<string16> {
BasicValueConverter() {}
virtual bool Convert(
- const base::Value& value, string16* field) const OVERRIDE {
+ const base::Value& value, string16* field) const override {
return value.GetAsString(field);
}
@@ -182,7 +182,7 @@ class BasicValueConverter<double> : public ValueConverter<double> {
public:
BasicValueConverter() {}
- virtual bool Convert(const base::Value& value, double* field) const OVERRIDE {
+ virtual bool Convert(const base::Value& value, double* field) const override {
return value.GetAsDouble(field);
}
@@ -195,7 +195,7 @@ class BasicValueConverter<bool> : public ValueConverter<bool> {
public:
BasicValueConverter() {}
- virtual bool Convert(const base::Value& value, bool* field) const OVERRIDE {
+ virtual bool Convert(const base::Value& value, bool* field) const override {
return value.GetAsBoolean(field);
}
@@ -212,7 +212,7 @@ class ValueFieldConverter : public ValueConverter<FieldType> {
: convert_func_(convert_func) {}
virtual bool Convert(const base::Value& value,
- FieldType* field) const OVERRIDE {
+ FieldType* field) const override {
return convert_func_(&value, field);
}
@@ -231,7 +231,7 @@ class CustomFieldConverter : public ValueConverter<FieldType> {
: convert_func_(convert_func) {}
virtual bool Convert(const base::Value& value,
- FieldType* field) const OVERRIDE {
+ FieldType* field) const override {
std::string string_value;
return value.GetAsString(&string_value) &&
convert_func_(string_value, field);
@@ -249,7 +249,7 @@ class NestedValueConverter : public ValueConverter<NestedType> {
NestedValueConverter() {}
virtual bool Convert(
- const base::Value& value, NestedType* field) const OVERRIDE {
+ const base::Value& value, NestedType* field) const override {
return converter_.Convert(value, field);
}
@@ -264,7 +264,7 @@ class RepeatedValueConverter : public ValueConverter<ScopedVector<Element> > {
RepeatedValueConverter() {}
virtual bool Convert(
- const base::Value& value, ScopedVector<Element>* field) const OVERRIDE {
+ const base::Value& value, ScopedVector<Element>* field) const override {
const base::ListValue* list = NULL;
if (!value.GetAsList(&list)) {
// The field is not a list.
@@ -300,7 +300,7 @@ class RepeatedMessageConverter
RepeatedMessageConverter() {}
virtual bool Convert(const base::Value& value,
- ScopedVector<NestedType>* field) const OVERRIDE {
+ ScopedVector<NestedType>* field) const override {
const base::ListValue* list = NULL;
if (!value.GetAsList(&list))
return false;
@@ -337,7 +337,7 @@ class RepeatedCustomValueConverter
: convert_func_(convert_func) {}
virtual bool Convert(const base::Value& value,
- ScopedVector<NestedType>* field) const OVERRIDE {
+ ScopedVector<NestedType>* field) const override {
const base::ListValue* list = NULL;
if (!value.GetAsList(&list))
return false;
« no previous file with comments | « base/json/json_string_value_serializer.h ('k') | base/json/json_value_serializer_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698