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

Unified Diff: base/json/json_reader.h

Issue 6085015: Order function definitions in base/ according to the header. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: lrn2merge Created 9 years, 11 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/hmac_nss.cc ('k') | base/json/json_reader.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: base/json/json_reader.h
diff --git a/base/json/json_reader.h b/base/json/json_reader.h
index 77c4e744dac4676a1303c5f5c3e3cecd22a3081d..a6f068675463eea2b147355b1b714d2eb288f689 100644
--- a/base/json/json_reader.h
+++ b/base/json/json_reader.h
@@ -146,14 +146,12 @@ class JSONReader {
bool allow_trailing_comma);
private:
- static std::string FormatErrorMessage(int line, int column,
- const std::string& description);
-
- DISALLOW_COPY_AND_ASSIGN(JSONReader);
-
FRIEND_TEST(JSONReaderTest, Reading);
FRIEND_TEST(JSONReaderTest, ErrorMessages);
+ static std::string FormatErrorMessage(int line, int column,
+ const std::string& description);
+
// Recursively build Value. Returns NULL if we don't have a valid JSON
// string. If |is_root| is true, we verify that the root element is either
// an object or an array.
@@ -213,6 +211,8 @@ class JSONReader {
JsonParseError error_code_;
int error_line_;
int error_col_;
+
+ DISALLOW_COPY_AND_ASSIGN(JSONReader);
};
} // namespace base
« no previous file with comments | « base/hmac_nss.cc ('k') | base/json/json_reader.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698