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

2 files changed, 6 insertions, 4 deletions

diff --git a/chrome/browser/views/frame/opaque_browser_frame_view.cc b/chrome/browser/views/frame/opaque_browser_frame_view.cc
index 3e58d71..89b50f5 100644
--- a/chrome/browser/views/frame/opaque_browser_frame_view.cc
+++ b/chrome/browser/views/frame/opaque_browser_frame_view.cc
@@ -24,7 +24,7 @@
 
 // static
 SkBitmap* OpaqueBrowserFrameView::distributor_logo_ = NULL;
-ChromeFont* OpaqueBrowserFrameView::title_font_ = NULL;
+gfx::Font* OpaqueBrowserFrameView::title_font_ = NULL;
 
 namespace {
 // The frame border is only visible in restored mode and is hardcoded to 4 px on
@@ -948,7 +948,7 @@ void OpaqueBrowserFrameView::InitClass() {
 void OpaqueBrowserFrameView::InitAppWindowResources() {
   static bool initialized = false;
   if (!initialized) {
-    title_font_ = new ChromeFont(win_util::GetWindowTitleFont());
+    title_font_ = new gfx::Font(win_util::GetWindowTitleFont());
     initialized = true;
   }
 }
diff --git a/chrome/browser/views/frame/opaque_browser_frame_view.h b/chrome/browser/views/frame/opaque_browser_frame_view.h
index 08aee7e..6d16a2f 100644
--- a/chrome/browser/views/frame/opaque_browser_frame_view.h
+++ b/chrome/browser/views/frame/opaque_browser_frame_view.h
@@ -11,7 +11,9 @@
 #include "views/window/non_client_view.h"
 
 class BrowserView;
-class ChromeFont;
+namespace gfx {
+class Font;
+}
 class TabContents;
 class TabStrip;
 namespace views {
@@ -150,7 +152,7 @@ class OpaqueBrowserFrameView : public BrowserNonClientFrameView,
   static void InitClass();
   static void InitAppWindowResources();
   static SkBitmap* distributor_logo_;
-  static ChromeFont* title_font_;
+  static gfx::Font* title_font_;
 
   DISALLOW_EVIL_CONSTRUCTORS(OpaqueBrowserFrameView);
 };