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 /app/resource_bundle.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 'app/resource_bundle.cc')
| -rw-r--r-- | app/resource_bundle.cc | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/app/resource_bundle.cc b/app/resource_bundle.cc index 85fd0b9..96bc714 100644 --- a/app/resource_bundle.cc +++ b/app/resource_bundle.cc @@ -159,24 +159,24 @@ SkBitmap* ResourceBundle::GetBitmapNamed(int resource_id) { 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: |