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

1 files changed, 5 insertions, 5 deletions

diff --git a/chrome/browser/views/about_chrome_view.cc b/chrome/browser/views/about_chrome_view.cc
index cc4e294..1468a24 100644
--- a/chrome/browser/views/about_chrome_view.cc
+++ b/chrome/browser/views/about_chrome_view.cc
@@ -226,7 +226,7 @@ void AboutChromeView::Init() {
   // Create a label and add the full text so we can query it for the height.
   views::Label dummy_text(full_text);
   dummy_text.SetMultiLine(true);
-  ChromeFont font =
+  gfx::Font font =
       ResourceBundle::GetSharedInstance().GetFont(ResourceBundle::BaseFont);
 
   // Add up the height of the various elements on the page.
@@ -360,8 +360,8 @@ void AboutChromeView::Paint(ChromeCanvas* canvas) {
   canvas->TileImageInt(*kBackgroundBmp, 0, 0,
                        dialog_dimensions_.width(), kBackgroundBmp->height());
 
-  ChromeFont font =
-    ResourceBundle::GetSharedInstance().GetFont(ResourceBundle::BaseFont);
+  gfx::Font font =
+      ResourceBundle::GetSharedInstance().GetFont(ResourceBundle::BaseFont);
 
   const gfx::Rect label_bounds = main_text_label_->bounds();
 
@@ -430,7 +430,7 @@ void AboutChromeView::DrawTextAndPositionUrl(ChromeCanvas* canvas,
                                              gfx::Rect* rect,
                                              gfx::Size* position,
                                              const gfx::Rect& bounds,
-                                             const ChromeFont& font) {
+                                             const gfx::Font& font) {
   DCHECK(canvas && position);
 
   // What we get passed in as |text| is potentially a mix of LTR and RTL "runs"
@@ -483,7 +483,7 @@ void AboutChromeView::DrawTextStartingFrom(ChromeCanvas* canvas,
                                            const std::wstring& text,
                                            gfx::Size* position,
                                            const gfx::Rect& bounds,
-                                           const ChromeFont& font,
+                                           const gfx::Font& font,
                                            bool ltr_within_rtl) {
   // Iterate through line breaking opportunities (which in English would be
   // spaces and such. This tells us where to wrap.