diff options
| author | beng@google.com <beng@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-05-15 02:16:10 +0000 |
|---|---|---|
| committer | beng@google.com <beng@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-05-15 02:16:10 +0000 |
| commit | 7322c44018c4e7b8bd58c67f52986660fb365d76 (patch) | |
| tree | 4bb67ec23689e83682a5aa228e3b8c402880baa8 /views/controls/link.cc | |
| parent | 0c875075a6c45e9979b8345e5f5f9d4b747e05c3 (diff) | |
| download | chromium_src-7322c44018c4e7b8bd58c67f52986660fb365d76.zip chromium_src-7322c44018c4e7b8bd58c67f52986660fb365d76.tar.gz chromium_src-7322c44018c4e7b8bd58c67f52986660fb365d76.tar.bz2 | |
ChromeFont->gfx::Font
Does not rename the files yet.
http://crbug.com/11387
Review URL: http://codereview.chromium.org/113441
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@16141 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views/controls/link.cc')
| -rw-r--r-- | views/controls/link.cc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/views/controls/link.cc b/views/controls/link.cc index aae254503..d89ce4d 100644 --- a/views/controls/link.cc +++ b/views/controls/link.cc @@ -131,17 +131,17 @@ void Link::SetHighlighted(bool f) { } void Link::ValidateStyle() { - ChromeFont font = GetFont(); + gfx::Font font = GetFont(); if (enabled_) { - if ((font.style() & ChromeFont::UNDERLINED) == 0) { + if ((font.style() & gfx::Font::UNDERLINED) == 0) { Label::SetFont(font.DeriveFont(0, font.style() | - ChromeFont::UNDERLINED)); + gfx::Font::UNDERLINED)); } } else { - if ((font.style() & ChromeFont::UNDERLINED) != 0) { + if ((font.style() & gfx::Font::UNDERLINED) != 0) { Label::SetFont(font.DeriveFont(0, font.style() & - ~ChromeFont::UNDERLINED)); + ~gfx::Font::UNDERLINED)); } } @@ -156,7 +156,7 @@ void Link::ValidateStyle() { } } -void Link::SetFont(const ChromeFont& font) { +void Link::SetFont(const gfx::Font& font) { Label::SetFont(font); ValidateStyle(); } |