diff options
| author | darin@chromium.org <darin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-11-30 20:39:41 +0000 |
|---|---|---|
| committer | darin@chromium.org <darin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-11-30 20:39:41 +0000 |
| commit | 48f619d8bd9a264f14ce4b62a935e05df015432b (patch) | |
| tree | 6b62dab3f626a126ed41a80960f3dc9a417cf550 /chrome/browser/bookmarks | |
| parent | 27773dfa39409674a0c319b527950369d2e82b75 (diff) | |
| download | chromium_src-48f619d8bd9a264f14ce4b62a935e05df015432b.zip chromium_src-48f619d8bd9a264f14ce4b62a935e05df015432b.tar.gz chromium_src-48f619d8bd9a264f14ce4b62a935e05df015432b.tar.bz2 | |
Remove std::wstring from most of net/base/escape.h.
I left the one API because based on the comment, it should eventually be
removed. Updated the callers to use UTF16ToWideHack until more work can be done
to remove std::wstring. I also updated net/base/escape_unittest.cc to use the
same hack until a proper solution can be coded.
Original patch submission here:
http://codereview.chromium.org/402085
Patch by Patrick Scott (phanna@android.com)
R=darin
BUG=23581
TEST=escape_unittest
Review URL: http://codereview.chromium.org/452015
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@33326 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/bookmarks')
| -rw-r--r-- | chrome/browser/bookmarks/bookmark_html_writer.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome/browser/bookmarks/bookmark_html_writer.cc b/chrome/browser/bookmarks/bookmark_html_writer.cc index 2dccfef..eb330ac 100644 --- a/chrome/browser/bookmarks/bookmark_html_writer.cc +++ b/chrome/browser/bookmarks/bookmark_html_writer.cc @@ -179,7 +179,7 @@ class Writer : public Task { break; case CONTENT: - utf8_string = WideToUTF8(EscapeForHTML(text)); + utf8_string = UTF16ToUTF8(EscapeForHTML(WideToUTF16Hack(text))); break; default: |