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

Side by Side Diff: sync/internal_api/public/base/progress_marker_map.cc

Issue 100823007: Stop doing unnecessary UTF-8 to UTF-16 conversions in JSONWriter. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix ChromeOS page encodings Created 7 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « sync/internal_api/public/base/ordinal.h ('k') | sync/syncable/entry.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 #include "sync/internal_api/public/base/progress_marker_map.h" 5 #include "sync/internal_api/public/base/progress_marker_map.h"
6 6
7 #include "base/json/json_writer.h" 7 #include "base/json/json_writer.h"
8 #include "base/json/string_escape.h" 8 #include "base/json/string_escape.h"
9 #include "base/values.h" 9 #include "base/values.h"
10 10
11 namespace syncer { 11 namespace syncer {
12 12
13 scoped_ptr<base::DictionaryValue> ProgressMarkerMapToValue( 13 scoped_ptr<base::DictionaryValue> ProgressMarkerMapToValue(
14 const ProgressMarkerMap& marker_map) { 14 const ProgressMarkerMap& marker_map) {
15 scoped_ptr<base::DictionaryValue> value(new base::DictionaryValue()); 15 scoped_ptr<base::DictionaryValue> value(new base::DictionaryValue());
16 for (ProgressMarkerMap::const_iterator it = marker_map.begin(); 16 for (ProgressMarkerMap::const_iterator it = marker_map.begin();
17 it != marker_map.end(); ++it) { 17 it != marker_map.end(); ++it) {
18 std::string printable_payload; 18 std::string printable_payload;
19 base::JsonDoubleQuote(it->second, 19 base::EscapeJSONString(
20 false /* put_in_quotes */, 20 it->second, false /* put_in_quotes */, &printable_payload);
21 &printable_payload);
22 value->SetString(ModelTypeToString(it->first), printable_payload); 21 value->SetString(ModelTypeToString(it->first), printable_payload);
23 } 22 }
24 return value.Pass(); 23 return value.Pass();
25 } 24 }
26 25
27 } // namespace syncer 26 } // namespace syncer
OLDNEW
« no previous file with comments | « sync/internal_api/public/base/ordinal.h ('k') | sync/syncable/entry.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698