Chromium Code Reviews

Unified Diff: views/controls/link.cc

Issue 113441: ChromeFont->gfx::Font... (Closed) Base URL: svn://chrome-svn.corp.google.com/chrome/trunk/src/
Patch Set: Created 11 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View side-by-side diff with in-line comments
« no previous file with comments | « views/controls/link.h ('k') | views/controls/menu/chrome_menu.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: views/controls/link.cc
===================================================================
--- views/controls/link.cc (revision 16106)
+++ views/controls/link.cc (working copy)
@@ -131,17 +131,17 @@
}
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::SetFont(const ChromeFont& font) {
+void Link::SetFont(const gfx::Font& font) {
Label::SetFont(font);
ValidateStyle();
}
« no previous file with comments | « views/controls/link.h ('k') | views/controls/menu/chrome_menu.h » ('j') | no next file with comments »

Powered by Google App Engine