app/resource_bundle.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: app/resource_bundle.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: app/resource_bundle.cc

===================================================================

--- app/resource_bundle.cc (revision 16106)

+++ app/resource_bundle.cc (working copy)

@@ -159,24 +159,24 @@

void ResourceBundle::LoadFontsIfNecessary() {

AutoLock lock_scope(lock_);

if (!base_font_.get()) {

- base_font_.reset(new ChromeFont());

+ base_font_.reset(new gfx::Font());

- small_font_.reset(new ChromeFont());

+ small_font_.reset(new gfx::Font());

*small_font_ = base_font_->DeriveFont(-2);

- medium_font_.reset(new ChromeFont());

+ medium_font_.reset(new gfx::Font());

*medium_font_ = base_font_->DeriveFont(3);

- medium_bold_font_.reset(new ChromeFont());

+ medium_bold_font_.reset(new gfx::Font());

*medium_bold_font_ =

- base_font_->DeriveFont(3, base_font_->style() | ChromeFont::BOLD);

+ base_font_->DeriveFont(3, base_font_->style() | gfx::Font::BOLD);

- large_font_.reset(new ChromeFont());

+ large_font_.reset(new gfx::Font());

*large_font_ = base_font_->DeriveFont(8);

}

-ChromeFont ResourceBundle::GetFont(FontStyle style) {

+gfx::Font ResourceBundle::GetFont(FontStyle style) {

LoadFontsIfNecessary();

switch(style) {

case SmallFont:

« no previous file with comments | « app/resource_bundle.h ('k') | app/win_util.h » ('j') | no next file with comments »