Index: base/json/string_escape.cc |
=================================================================== |
--- base/json/string_escape.cc (revision 0) |
+++ base/json/string_escape.cc (working copy) |
@@ -2,14 +2,16 @@ |
// Use of this source code is governed by a BSD-style license that can be |
// found in the LICENSE file. |
-#include "base/string_escape.h" |
+#include "base/json/string_escape.h" |
#include <string> |
#include "base/string_util.h" |
-namespace string_escape { |
+namespace base { |
+namespace { |
+ |
// Try to escape |c| as a "SingleEscapeCharacter" (\n, etc). If successful, |
// returns true and appends the escape sequence to |dst|. This isn't required |
// by the spec, but it's more readable by humans than the \uXXXX alternatives. |
@@ -72,6 +74,8 @@ |
dst->push_back('"'); |
} |
+} // namespace |
+ |
void JsonDoubleQuote(const std::string& str, |
bool put_in_quotes, |
std::string* dst) { |
@@ -84,4 +88,4 @@ |
JsonDoubleQuoteT(str, put_in_quotes, dst); |
} |
-} // namespace string_escape |
+} // namespace base |
Property changes on: base/json/string_escape.cc |
___________________________________________________________________ |
Added: svn:mergeinfo |
Merged /branches/chrome_webkit_merge_branch/base/string_escape.cc:r69-2775 |