diff options
Diffstat (limited to 'app/gfx')
| -rw-r--r-- | app/gfx/font_util.cc | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/app/gfx/font_util.cc b/app/gfx/font_util.cc index b079dd9..61e1b52dd 100644 --- a/app/gfx/font_util.cc +++ b/app/gfx/font_util.cc @@ -6,7 +6,7 @@ #include "app/l10n_util.h" #include "base/logging.h" -#include "base/string_util.h" +#include "base/string_number_conversions.h" #include "base/utf_string_conversions.h" #include "gfx/font.h" @@ -15,7 +15,8 @@ namespace gfx { int GetLocalizedContentsWidthForFont(int col_resource_id, const gfx::Font& font) { double chars = 0; - StringToDouble(WideToUTF8(l10n_util::GetString(col_resource_id)), &chars); + base::StringToDouble(WideToUTF8(l10n_util::GetString(col_resource_id)), + &chars); int width = font.GetExpectedTextWidth(static_cast<int>(chars)); DCHECK_GT(width, 0); return width; @@ -24,7 +25,8 @@ int GetLocalizedContentsWidthForFont(int col_resource_id, int GetLocalizedContentsHeightForFont(int row_resource_id, const gfx::Font& font) { double lines = 0; - StringToDouble(WideToUTF8(l10n_util::GetString(row_resource_id)), &lines); + base::StringToDouble(WideToUTF8(l10n_util::GetString(row_resource_id)), + &lines); int height = static_cast<int>(font.height() * lines); DCHECK_GT(height, 0); return height; |