ChromeFont->gfx::Font...

app/resource_bundle.cc

 // Copyright (c) 2006-2009 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "app/resource_bundle.h"
 
 #include "app/gfx/chrome_font.h"
 #include "base/gfx/png_decoder.h"
 #include "base/logging.h"
 #include "base/string_piece.h"
@@ skipping 141 matching lines @@
       empty_bitmap->allocPixels();
       empty_bitmap->eraseARGB(255, 255, 0, 0);
     }
     return empty_bitmap;
   }
 }
 
 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:
       return *small_font_;
     case MediumFont:
       return *medium_font_;
     case MediumBoldFont:
       return *medium_bold_font_;
     case LargeFont:
       return *large_font_;
     default:
       return *base_font_;
   }
 }