diff options
| author | jhawkins@chromium.org <jhawkins@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-09 00:38:41 +0000 |
|---|---|---|
| committer | jhawkins@chromium.org <jhawkins@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-09 00:38:41 +0000 |
| commit | 379e7a5a9b6934dca457eb3eaeb66a05a8946a8a (patch) | |
| tree | 7fb61b6338cab5433fdf57517d9e56f23dac881c /base/i18n | |
| parent | 0ef51cc6d25951d6dbaf4d8036d00b3316059ce9 (diff) | |
| download | chromium_src-379e7a5a9b6934dca457eb3eaeb66a05a8946a8a.zip chromium_src-379e7a5a9b6934dca457eb3eaeb66a05a8946a8a.tar.gz chromium_src-379e7a5a9b6934dca457eb3eaeb66a05a8946a8a.tar.bz2 | |
base: string_util.h -> utf_string_conversions.h fix.
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/678001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@40972 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/i18n')
| -rw-r--r-- | base/i18n/file_util_icu.cc | 2 | ||||
| -rw-r--r-- | base/i18n/time_formatting.cc | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/base/i18n/file_util_icu.cc b/base/i18n/file_util_icu.cc index f62a05e..0e9c2cd 100644 --- a/base/i18n/file_util_icu.cc +++ b/base/i18n/file_util_icu.cc @@ -7,9 +7,11 @@ #include "base/i18n/file_util_icu.h" #include "base/file_path.h" +#include "base/logging.h" #include "base/scoped_ptr.h" #include "base/singleton.h" #include "base/string_util.h" +#include "base/utf_string_conversions.h" #include "base/sys_string_conversions.h" #include "build/build_config.h" #include "unicode/coll.h" diff --git a/base/i18n/time_formatting.cc b/base/i18n/time_formatting.cc index f031cf7..406145d 100644 --- a/base/i18n/time_formatting.cc +++ b/base/i18n/time_formatting.cc @@ -6,7 +6,7 @@ #include "base/logging.h" #include "base/scoped_ptr.h" -#include "base/string_util.h" +#include "base/utf_string_conversions.h" #include "base/time.h" #include "unicode/datefmt.h" @@ -27,7 +27,7 @@ std::wstring TimeFormat(const icu::DateFormat* formatter, return output; } -} +} // namespace namespace base { |