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

Unified Diff: chrome/common/json_value_serializer.h

Issue 13169: Add error messages to JSONReader and friends. This required a bit of refactor... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 12 years 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: chrome/common/json_value_serializer.h
===================================================================
--- chrome/common/json_value_serializer.h (revision 6390)
+++ chrome/common/json_value_serializer.h (working copy)
@@ -41,8 +41,10 @@
// in to the constructor into a structure of Value objects. If the return
// value is true, the |root| parameter will be set to point to a new Value
// object that corresponds to the values represented in the string. The
- // caller takes ownership of the returned Value objects.
- bool Deserialize(Value** root);
+ // caller takes ownership of the returned Value objects. Otherwise, the root
+ // value will be changed and if |error_message| is non-null, it will contain
+ // a string describing the error.
+ bool Deserialize(Value** root, std::string* error_message);
void set_pretty_print(bool new_value) { pretty_print_ = new_value; }
bool pretty_print() { return pretty_print_; }
@@ -86,8 +88,10 @@
// in to the constructor into a structure of Value objects. If the return
// value is true, the |root| parameter will be set to point to a new Value
// object that corresponds to the values represented in the file. The
- // caller takes ownership of the returned Value objects.
- bool Deserialize(Value** root);
+ // caller takes ownership of the returned Value objects. Otherwise, the root
+ // value will be changed and if |error_message| is non-null, it will contain
+ // a string describing the error.
+ bool Deserialize(Value** root, std::string* error_message);
private:
std::wstring json_file_path_;

Powered by Google App Engine
This is Rietveld 408576698