diff options
| author | Iain Merrick <husky@google.com> | 2010-10-19 14:37:37 +0100 |
|---|---|---|
| committer | Iain Merrick <husky@google.com> | 2010-10-19 14:37:37 +0100 |
| commit | 3345a6884c488ff3a535c2c9acdd33d74b37e311 (patch) | |
| tree | 7784b988ef1698cb6967ea1bdf07616237716c6c /chrome/browser/chromeos/wm_overview_title.cc | |
| parent | efc8475837ec58186051f23bb03542620424f6ce (diff) | |
| download | external_chromium-3345a6884c488ff3a535c2c9acdd33d74b37e311.zip external_chromium-3345a6884c488ff3a535c2c9acdd33d74b37e311.tar.gz external_chromium-3345a6884c488ff3a535c2c9acdd33d74b37e311.tar.bz2 | |
Merge Chromium at 7.0.540.0 : Initial merge by git
Not including third_party/icu as it contains huge data files that break Gerrit, and aren't actually used.
Change-Id: I428a386e70f3b58cacd28677b8cfda282e891e15
Diffstat (limited to 'chrome/browser/chromeos/wm_overview_title.cc')
| -rw-r--r-- | chrome/browser/chromeos/wm_overview_title.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/chrome/browser/chromeos/wm_overview_title.cc b/chrome/browser/chromeos/wm_overview_title.cc index 2c21bc6..0325065 100644 --- a/chrome/browser/chromeos/wm_overview_title.cc +++ b/chrome/browser/chromeos/wm_overview_title.cc @@ -8,6 +8,7 @@ #include "app/x11_util.h" #include "base/string16.h" +#include "base/utf_string_conversions.h" #include "chrome/browser/browser.h" #include "chrome/browser/browser_window.h" #include "chrome/browser/chromeos/drop_shadow_label.h" @@ -42,9 +43,9 @@ namespace { // given value (well, unless the font at size 1 is taller than the // given value). Font FindFontThisHigh(int pixels, Font base) { - Font font = Font::CreateFont(base.FontName(), 1); + Font font(base.GetFontName(), 1); Font last_font = font; - while (font.height() < pixels) { + while (font.GetHeight() < pixels) { last_font = font; font = font.DeriveFont(1, Font::BOLD); } |