diff options
| author | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-28 16:55:57 +0000 |
|---|---|---|
| committer | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-28 16:55:57 +0000 |
| commit | d223f3bfefc0c92a216f21c4d84e844bb663c2a6 (patch) | |
| tree | f4982b4490fe13de645b445ab95f3c82c95cf8aa /app/gfx/font_util.cc | |
| parent | bf570fb6773be4e4082b73c5b7a32fff5dc6663b (diff) | |
| download | chromium_src-d223f3bfefc0c92a216f21c4d84e844bb663c2a6.zip chromium_src-d223f3bfefc0c92a216f21c4d84e844bb663c2a6.tar.gz chromium_src-d223f3bfefc0c92a216f21c4d84e844bb663c2a6.tar.bz2 | |
Remove wstring from l10n_util. Part 1.
BUG=9911
TEST=no visible changes; all tests pass
Review URL: http://codereview.chromium.org/5990008
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@70224 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'app/gfx/font_util.cc')
| -rw-r--r-- | app/gfx/font_util.cc | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/app/gfx/font_util.cc b/app/gfx/font_util.cc index 1c3cfca..a977f57 100644 --- a/app/gfx/font_util.cc +++ b/app/gfx/font_util.cc @@ -15,8 +15,7 @@ namespace gfx { int GetLocalizedContentsWidthForFont(int col_resource_id, const gfx::Font& font) { double chars = 0; - base::StringToDouble(WideToUTF8(l10n_util::GetString(col_resource_id)), - &chars); + base::StringToDouble(l10n_util::GetStringUTF8(col_resource_id), &chars); int width = font.GetExpectedTextWidth(static_cast<int>(chars)); DCHECK_GT(width, 0); return width; @@ -25,8 +24,7 @@ int GetLocalizedContentsWidthForFont(int col_resource_id, int GetLocalizedContentsHeightForFont(int row_resource_id, const gfx::Font& font) { double lines = 0; - base::StringToDouble(WideToUTF8(l10n_util::GetString(row_resource_id)), - &lines); + base::StringToDouble(l10n_util::GetStringUTF8(row_resource_id), &lines); int height = static_cast<int>(font.GetHeight() * lines); DCHECK_GT(height, 0); return height; |