diff options
| author | jhawkins@chromium.org <jhawkins@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-07 20:53:33 +0000 |
|---|---|---|
| committer | jhawkins@chromium.org <jhawkins@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-07 20:53:33 +0000 |
| commit | b1e4eb506631e71476d10aeeebcd347585b31566 (patch) | |
| tree | 7926c67055734b8d1a9ea1982deaaa525bfa1f8f /webkit/glue/webkit_glue.cc | |
| parent | 8e7b2d5326c18f3fe239927a3ee9eb39ca432bd6 (diff) | |
| download | chromium_src-b1e4eb506631e71476d10aeeebcd347585b31566.zip chromium_src-b1e4eb506631e71476d10aeeebcd347585b31566.tar.gz chromium_src-b1e4eb506631e71476d10aeeebcd347585b31566.tar.bz2 | |
Reland r40855 with chromeos fix.
webkit/glue: string_util.h -> utf_string_conversions.h fix.
TBR=bradnelson
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/668242
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@40872 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/glue/webkit_glue.cc')
| -rw-r--r-- | webkit/glue/webkit_glue.cc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/webkit/glue/webkit_glue.cc b/webkit/glue/webkit_glue.cc index 9e718a7..c3426a6c 100644 --- a/webkit/glue/webkit_glue.cc +++ b/webkit/glue/webkit_glue.cc @@ -12,11 +12,13 @@ #endif #include "base/file_version_info.h" +#include "base/logging.h" #include "base/singleton.h" #include "base/string_piece.h" #include "base/string_util.h" #include "base/sys_info.h" #include "base/sys_string_conversions.h" +#include "base/utf_string_conversions.h" #include "net/base/escape.h" #include "skia/ext/platform_canvas.h" #if defined(OS_MACOSX) |