| Index: app/gfx/font_util.cc
|
| ===================================================================
|
| --- app/gfx/font_util.cc (revision 54340)
|
| +++ app/gfx/font_util.cc (working copy)
|
| @@ -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 @@
|
| 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 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;
|
|
|