diff options
| author | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-07 02:10:20 +0000 |
|---|---|---|
| committer | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-07 02:10:20 +0000 |
| commit | 047a03f4cefa75a67070f08b3f6b727f7ea702d5 (patch) | |
| tree | d00ccbd9e59106de8fd904b06720be59219d61fe /base/json_reader.cc | |
| parent | 0511c153260e5d402d7552ff7b47a2acb17bdf2b (diff) | |
| download | chromium_src-047a03f4cefa75a67070f08b3f6b727f7ea702d5.zip chromium_src-047a03f4cefa75a67070f08b3f6b727f7ea702d5.tar.gz chromium_src-047a03f4cefa75a67070f08b3f6b727f7ea702d5.tar.bz2 | |
Copy the relevant parts of ICU to a new file base/third_party/icu/icu_utf.*
so we can do basic UTF8/16/32 conversions without linking all of ICU.
Change callers who used to call SysUTF8ToWide/SysWideToUTF8 in base to using
these new functions. I will remove the Sys versions of these functions in a
later patch.
TEST=none
BUG=none
Review URL: http://codereview.chromium.org/243102
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@28219 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/json_reader.cc')
| -rw-r--r-- | base/json_reader.cc | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/base/json_reader.cc b/base/json_reader.cc index 2c3ab0b..ca33cb2 100644 --- a/base/json_reader.cc +++ b/base/json_reader.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. +// Copyright (c) 2009 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -8,6 +8,7 @@ #include "base/logging.h" #include "base/scoped_ptr.h" #include "base/string_util.h" +#include "base/utf_string_conversions.h" #include "base/values.h" static const JSONReader::Token kInvalidToken(JSONReader::Token::INVALID_TOKEN, @@ -118,8 +119,8 @@ std::string JSONReader::FormatErrorMessage(int line, int column, } JSONReader::JSONReader() - : start_pos_(NULL), json_pos_(NULL), stack_depth_(0), - allow_trailing_comma_(false) {} + : start_pos_(NULL), json_pos_(NULL), stack_depth_(0), + allow_trailing_comma_(false) {} Value* JSONReader::JsonToValue(const std::string& json, bool check_root, bool allow_trailing_comma) { |