views/controls/link.cc - Issue 113441: ChromeFont->gfx::Font...

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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. Draft comments are only viewable by you.

Jump to:

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 »