diff options
| author | mal@google.com <mal@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-14 23:58:14 +0000 |
|---|---|---|
| committer | mal@google.com <mal@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-14 23:58:14 +0000 |
| commit | dad8a371401663b4528523b5e55d9b8a3c44d497 (patch) | |
| tree | b8bd440bcf3a18e9112a62be5af570b43b5ea6df /chrome/browser/views | |
| parent | af2dea3bb8ad7e272d2363f802b2f23f7023028a (diff) | |
| download | chromium_src-dad8a371401663b4528523b5e55d9b8a3c44d497.zip chromium_src-dad8a371401663b4528523b5e55d9b8a3c44d497.tar.gz chromium_src-dad8a371401663b4528523b5e55d9b8a3c44d497.tar.bz2 | |
Fix two calls to font.height to font.GetHeight.
This is a follow on to r56040, "Rework gfx::Font by moving platform-specific code into inner classes"
These two lines are inside #if defined(GOOGLE_CHROME_BUILD) and only
get compiled for Google Chrome official builds (which have been broken
for Windows and ChromeOS since r56040).
TBR= ben
BUG= none
TEST= Google Chrome builders pass
http://build.chromium.org/buildbot/waterfall.fyi/waterfall?builder=Google%20Chrome%20ChromeOS
http://build.chromium.org/buildbot/waterfall.fyi/waterfall?builder=Google%20Chrome%20XP
Review URL: http://codereview.chromium.org/3161019
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@56150 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/views')
| -rw-r--r-- | chrome/browser/views/about_chrome_view.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/browser/views/about_chrome_view.cc b/chrome/browser/views/about_chrome_view.cc index fd60495..391ce6a 100644 --- a/chrome/browser/views/about_chrome_view.cc +++ b/chrome/browser/views/about_chrome_view.cc @@ -310,7 +310,7 @@ void AboutChromeView::Init() { terms_of_service_url_->SetController(this); // Add the Terms of Service line and some whitespace. - height += font.height() + kRelatedControlVerticalSpacing; + height += font.GetHeight() + kRelatedControlVerticalSpacing; #endif // Use whichever is greater (the calculated height or the specified minimum @@ -466,7 +466,7 @@ void AboutChromeView::Paint(gfx::Canvas* canvas) { #if defined(GOOGLE_CHROME_BUILD) // Insert a line break and some whitespace. position.set_width(0); - position.Enlarge(0, font.height() + kRelatedControlVerticalSpacing); + position.Enlarge(0, font.GetHeight() + kRelatedControlVerticalSpacing); // And now the Terms of Service and position the TOS url. view_text_utils::DrawTextAndPositionUrl(canvas, main_text_label_, |