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

Side by Side Diff: base/json/json_string_value_serializer.h

Issue 614103004: replace 'virtual ... OVERRIDE' with '... override' (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: process 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 unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef BASE_JSON_JSON_STRING_VALUE_SERIALIZER_H_ 5 #ifndef BASE_JSON_JSON_STRING_VALUE_SERIALIZER_H_
6 #define BASE_JSON_JSON_STRING_VALUE_SERIALIZER_H_ 6 #define BASE_JSON_JSON_STRING_VALUE_SERIALIZER_H_
7 7
8 #include <string> 8 #include <string>
9 9
10 #include "base/base_export.h" 10 #include "base/base_export.h"
(...skipping 20 matching lines...) Expand all
31 initialized_with_const_string_(true), 31 initialized_with_const_string_(true),
32 pretty_print_(false), 32 pretty_print_(false),
33 allow_trailing_comma_(false) { 33 allow_trailing_comma_(false) {
34 } 34 }
35 35
36 virtual ~JSONStringValueSerializer(); 36 virtual ~JSONStringValueSerializer();
37 37
38 // Attempt to serialize the data structure represented by Value into 38 // Attempt to serialize the data structure represented by Value into
39 // JSON. If the return value is true, the result will have been written 39 // JSON. If the return value is true, the result will have been written
40 // into the string passed into the constructor. 40 // into the string passed into the constructor.
41 virtual bool Serialize(const base::Value& root) OVERRIDE; 41 bool Serialize(const base::Value& root) override;
42 42
43 // Equivalent to Serialize(root) except binary values are omitted from the 43 // Equivalent to Serialize(root) except binary values are omitted from the
44 // output. 44 // output.
45 bool SerializeAndOmitBinaryValues(const base::Value& root); 45 bool SerializeAndOmitBinaryValues(const base::Value& root);
46 46
47 // Attempt to deserialize the data structure encoded in the string passed 47 // Attempt to deserialize the data structure encoded in the string passed
48 // in to the constructor into a structure of Value objects. If the return 48 // in to the constructor into a structure of Value objects. If the return
49 // value is NULL, and if |error_code| is non-null, |error_code| will 49 // value is NULL, and if |error_code| is non-null, |error_code| will
50 // contain an integer error code (a JsonParseError in this case). 50 // contain an integer error code (a JsonParseError in this case).
51 // If |error_message| is non-null, it will be filled in with a formatted 51 // If |error_message| is non-null, it will be filled in with a formatted
52 // error message including the location of the error if appropriate. 52 // error message including the location of the error if appropriate.
53 // The caller takes ownership of the returned value. 53 // The caller takes ownership of the returned value.
54 virtual base::Value* Deserialize(int* error_code, 54 base::Value* Deserialize(int* error_code,
55 std::string* error_message) OVERRIDE; 55 std::string* error_message) override;
56 56
57 void set_pretty_print(bool new_value) { pretty_print_ = new_value; } 57 void set_pretty_print(bool new_value) { pretty_print_ = new_value; }
58 bool pretty_print() { return pretty_print_; } 58 bool pretty_print() { return pretty_print_; }
59 59
60 void set_allow_trailing_comma(bool new_value) { 60 void set_allow_trailing_comma(bool new_value) {
61 allow_trailing_comma_ = new_value; 61 allow_trailing_comma_ = new_value;
62 } 62 }
63 63
64 private: 64 private:
65 bool SerializeInternal(const base::Value& root, bool omit_binary_values); 65 bool SerializeInternal(const base::Value& root, bool omit_binary_values);
66 66
67 std::string* json_string_; 67 std::string* json_string_;
68 bool initialized_with_const_string_; 68 bool initialized_with_const_string_;
69 bool pretty_print_; // If true, serialization will span multiple lines. 69 bool pretty_print_; // If true, serialization will span multiple lines.
70 // If true, deserialization will allow trailing commas. 70 // If true, deserialization will allow trailing commas.
71 bool allow_trailing_comma_; 71 bool allow_trailing_comma_;
72 72
73 DISALLOW_COPY_AND_ASSIGN(JSONStringValueSerializer); 73 DISALLOW_COPY_AND_ASSIGN(JSONStringValueSerializer);
74 }; 74 };
75 75
76 #endif // BASE_JSON_JSON_STRING_VALUE_SERIALIZER_H_ 76 #endif // BASE_JSON_JSON_STRING_VALUE_SERIALIZER_H_
77 77
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698