| 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..3de6e0d9568f2d728b3278586fd229b60916d297 100644
|
| --- a/base/json/json_value_converter.h
|
| +++ b/base/json/json_value_converter.h
|
| @@ -122,8 +122,7 @@ class FieldConverter : public FieldConverterBase<StructType> {
|
| value_converter_(converter) {
|
| }
|
|
|
| - virtual bool ConvertField(
|
| - const base::Value& value, StructType* dst) const OVERRIDE {
|
| + bool ConvertField(const base::Value& value, StructType* dst) const override {
|
| return value_converter_->Convert(value, &(dst->*field_pointer_));
|
| }
|
|
|
| @@ -141,7 +140,7 @@ class BasicValueConverter<int> : public ValueConverter<int> {
|
| public:
|
| BasicValueConverter() {}
|
|
|
| - virtual bool Convert(const base::Value& value, int* field) const OVERRIDE {
|
| + bool Convert(const base::Value& value, int* field) const override {
|
| return value.GetAsInteger(field);
|
| }
|
|
|
| @@ -154,8 +153,7 @@ class BasicValueConverter<std::string> : public ValueConverter<std::string> {
|
| public:
|
| BasicValueConverter() {}
|
|
|
| - virtual bool Convert(
|
| - const base::Value& value, std::string* field) const OVERRIDE {
|
| + bool Convert(const base::Value& value, std::string* field) const override {
|
| return value.GetAsString(field);
|
| }
|
|
|
| @@ -168,8 +166,7 @@ class BasicValueConverter<string16> : public ValueConverter<string16> {
|
| public:
|
| BasicValueConverter() {}
|
|
|
| - virtual bool Convert(
|
| - const base::Value& value, string16* field) const OVERRIDE {
|
| + bool Convert(const base::Value& value, string16* field) const override {
|
| return value.GetAsString(field);
|
| }
|
|
|
| @@ -182,7 +179,7 @@ class BasicValueConverter<double> : public ValueConverter<double> {
|
| public:
|
| BasicValueConverter() {}
|
|
|
| - virtual bool Convert(const base::Value& value, double* field) const OVERRIDE {
|
| + bool Convert(const base::Value& value, double* field) const override {
|
| return value.GetAsDouble(field);
|
| }
|
|
|
| @@ -195,7 +192,7 @@ class BasicValueConverter<bool> : public ValueConverter<bool> {
|
| public:
|
| BasicValueConverter() {}
|
|
|
| - virtual bool Convert(const base::Value& value, bool* field) const OVERRIDE {
|
| + bool Convert(const base::Value& value, bool* field) const override {
|
| return value.GetAsBoolean(field);
|
| }
|
|
|
| @@ -211,8 +208,7 @@ class ValueFieldConverter : public ValueConverter<FieldType> {
|
| ValueFieldConverter(ConvertFunc convert_func)
|
| : convert_func_(convert_func) {}
|
|
|
| - virtual bool Convert(const base::Value& value,
|
| - FieldType* field) const OVERRIDE {
|
| + bool Convert(const base::Value& value, FieldType* field) const override {
|
| return convert_func_(&value, field);
|
| }
|
|
|
| @@ -230,8 +226,7 @@ class CustomFieldConverter : public ValueConverter<FieldType> {
|
| CustomFieldConverter(ConvertFunc convert_func)
|
| : convert_func_(convert_func) {}
|
|
|
| - virtual bool Convert(const base::Value& value,
|
| - FieldType* field) const OVERRIDE {
|
| + bool Convert(const base::Value& value, FieldType* field) const override {
|
| std::string string_value;
|
| return value.GetAsString(&string_value) &&
|
| convert_func_(string_value, field);
|
| @@ -248,8 +243,7 @@ class NestedValueConverter : public ValueConverter<NestedType> {
|
| public:
|
| NestedValueConverter() {}
|
|
|
| - virtual bool Convert(
|
| - const base::Value& value, NestedType* field) const OVERRIDE {
|
| + bool Convert(const base::Value& value, NestedType* field) const override {
|
| return converter_.Convert(value, field);
|
| }
|
|
|
| @@ -263,8 +257,8 @@ class RepeatedValueConverter : public ValueConverter<ScopedVector<Element> > {
|
| public:
|
| RepeatedValueConverter() {}
|
|
|
| - virtual bool Convert(
|
| - const base::Value& value, ScopedVector<Element>* field) const OVERRIDE {
|
| + bool Convert(const base::Value& value,
|
| + ScopedVector<Element>* field) const override {
|
| const base::ListValue* list = NULL;
|
| if (!value.GetAsList(&list)) {
|
| // The field is not a list.
|
| @@ -299,8 +293,8 @@ class RepeatedMessageConverter
|
| public:
|
| RepeatedMessageConverter() {}
|
|
|
| - virtual bool Convert(const base::Value& value,
|
| - ScopedVector<NestedType>* field) const OVERRIDE {
|
| + bool Convert(const base::Value& value,
|
| + ScopedVector<NestedType>* field) const override {
|
| const base::ListValue* list = NULL;
|
| if (!value.GetAsList(&list))
|
| return false;
|
| @@ -336,8 +330,8 @@ class RepeatedCustomValueConverter
|
| RepeatedCustomValueConverter(ConvertFunc convert_func)
|
| : convert_func_(convert_func) {}
|
|
|
| - virtual bool Convert(const base::Value& value,
|
| - ScopedVector<NestedType>* field) const OVERRIDE {
|
| + bool Convert(const base::Value& value,
|
| + ScopedVector<NestedType>* field) const override {
|
| const base::ListValue* list = NULL;
|
| if (!value.GetAsList(&list))
|
| return false;
|
|
|