summaryrefslogtreecommitdiffstats
path: root/app/l10n_util.cc
diff options
context:
space:
mode:
authorbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-07-30 19:28:44 +0000
committerbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-07-30 19:28:44 +0000
commit528c56de01bbbd38788ed6cf8d2eea4c56cbe19e (patch)
treeac4f7a001affd772c4ab89701d3d46109b5f9e19 /app/l10n_util.cc
parent5c86ada8d84f6e67d17b027d347052ef451241c4 (diff)
downloadchromium_src-528c56de01bbbd38788ed6cf8d2eea4c56cbe19e.zip
chromium_src-528c56de01bbbd38788ed6cf8d2eea4c56cbe19e.tar.gz
chromium_src-528c56de01bbbd38788ed6cf8d2eea4c56cbe19e.tar.bz2
Move the number conversions from string_util to a new file.
Use the base namespace in the new file. Update callers. I removed all wstring variants and also the string->number ones that ignore the return value. That encourages people to write code and forget about error handling. TEST=included unit tests BUG=none Review URL: http://codereview.chromium.org/3056029 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@54355 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'app/l10n_util.cc')
-rw-r--r--app/l10n_util.cc7
1 files changed, 3 insertions, 4 deletions
diff --git a/app/l10n_util.cc b/app/l10n_util.cc
index 95fd0ee..b3e550f 100644
--- a/app/l10n_util.cc
+++ b/app/l10n_util.cc
@@ -16,8 +16,7 @@
#include "base/path_service.h"
#include "base/scoped_ptr.h"
#include "base/string16.h"
-#include "base/string_piece.h"
-#include "base/string_util.h"
+#include "base/string_number_conversions.h"
#include "base/sys_string_conversions.h"
#include "build/build_config.h"
#include "gfx/canvas.h"
@@ -648,11 +647,11 @@ string16 GetStringFUTF16(int message_id,
}
std::wstring GetStringF(int message_id, int a) {
- return GetStringF(message_id, IntToWString(a));
+ return GetStringF(message_id, UTF8ToWide(base::IntToString(a)));
}
std::wstring GetStringF(int message_id, int64 a) {
- return GetStringF(message_id, Int64ToWString(a));
+ return GetStringF(message_id, UTF8ToWide(base::Int64ToString(a)));
}
std::wstring TruncateString(const std::wstring& string, size_t length) {