diff options
| author | jhawkins@chromium.org <jhawkins@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-06 22:19:00 +0000 |
|---|---|---|
| committer | jhawkins@chromium.org <jhawkins@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-06 22:19:00 +0000 |
| commit | 480779dd7e77552f4d1190b9804109dc0083df27 (patch) | |
| tree | b542f44216712c56dd7e71d394079fa59069330e /app/gfx/font_util.cc | |
| parent | 3b2d7768f6797c2b34c2517b01cf9efc073e5c93 (diff) | |
| download | chromium_src-480779dd7e77552f4d1190b9804109dc0083df27.zip chromium_src-480779dd7e77552f4d1190b9804109dc0083df27.tar.gz chromium_src-480779dd7e77552f4d1190b9804109dc0083df27.tar.bz2 | |
app: string_util.h -> utf_string_conversions.h fix.
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/668226
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@40853 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'app/gfx/font_util.cc')
| -rw-r--r-- | app/gfx/font_util.cc | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/app/gfx/font_util.cc b/app/gfx/font_util.cc index 278677c..ec94489 100644 --- a/app/gfx/font_util.cc +++ b/app/gfx/font_util.cc @@ -7,6 +7,8 @@ #include "app/gfx/font.h" #include "app/l10n_util.h" #include "base/logging.h" +#include "base/string_util.h" +#include "base/utf_string_conversions.h" namespace gfx { @@ -15,7 +17,7 @@ int GetLocalizedContentsWidthForFont(int col_resource_id, double chars = 0; StringToDouble(WideToUTF8(l10n_util::GetString(col_resource_id)), &chars); int width = font.GetExpectedTextWidth(static_cast<int>(chars)); - DCHECK(width > 0); + DCHECK_GT(width, 0); return width; } @@ -24,7 +26,7 @@ int GetLocalizedContentsHeightForFont(int row_resource_id, double lines = 0; StringToDouble(WideToUTF8(l10n_util::GetString(row_resource_id)), &lines); int height = static_cast<int>(font.height() * lines); - DCHECK(height > 0); + DCHECK_GT(height, 0); return height; } @@ -36,4 +38,3 @@ gfx::Size GetLocalizedContentsSizeForFont(int col_resource_id, } } // namespace gfx - |