5 files changed, 10 insertions, 10 deletions
diff --git a/views/window/custom_frame_view.cc b/views/window/custom_frame_view.cc
index 19ce2fb..f7f9ab3 100644
--- a/views/window/custom_frame_view.cc
+++ b/views/window/custom_frame_view.cc
@@ -23,7 +23,7 @@
 namespace views {
 
 // static
-ChromeFont* CustomFrameView::title_font_ = NULL;
+gfx::Font* CustomFrameView::title_font_ = NULL;
 
 namespace {
 // The frame border is only visible in restored mode and is hardcoded to 4 px on
@@ -585,10 +585,10 @@ void CustomFrameView::InitClass() {
   static bool initialized = false;
   if (!initialized) {
 #if defined(OS_WIN)
-    title_font_ = new ChromeFont(win_util::GetWindowTitleFont());
+    title_font_ = new gfx::Font(win_util::GetWindowTitleFont());
 #elif defined(OS_LINUX)
     // TODO: need to resolve what font this is.
-    title_font_ = new ChromeFont();
+    title_font_ = new gfx::Font();
 #endif
     initialized = true;
   }
diff --git a/views/window/custom_frame_view.h b/views/window/custom_frame_view.h
index ac0b114..0c41009 100644
--- a/views/window/custom_frame_view.h
+++ b/views/window/custom_frame_view.h
@@ -11,12 +11,12 @@
 #include "views/window/window_resources.h"
 
 namespace gfx{
+class Font;
 class Size;
 class Path;
 class Point;
 }
 class ChromeCanvas;
-class ChromeFont;
 
 namespace views {
 
@@ -104,7 +104,7 @@ class CustomFrameView : public NonClientFrameView,
 
   // Initialize various static resources.
   static void InitClass();
-  static ChromeFont* title_font_;
+  static gfx::Font* title_font_;
 
   DISALLOW_EVIL_CONSTRUCTORS(CustomFrameView);
 };
diff --git a/views/window/dialog_client_view.cc b/views/window/dialog_client_view.cc
index 28c721c..9e25462 100644
--- a/views/window/dialog_client_view.cc
+++ b/views/window/dialog_client_view.cc
@@ -77,7 +77,7 @@ class DialogButton : public NativeButton {
 }  // namespace
 
 // static
-ChromeFont* DialogClientView::dialog_button_font_ = NULL;
+gfx::Font* DialogClientView::dialog_button_font_ = NULL;
 static const int kDialogMinButtonWidth = 75;
 static const int kDialogButtonLabelSpacing = 16;
 static const int kDialogButtonContentSpacing = 5;
@@ -454,7 +454,7 @@ void DialogClientView::InitClass() {
   static bool initialized = false;
   if (!initialized) {
     ResourceBundle& rb = ResourceBundle::GetSharedInstance();
-    dialog_button_font_ = new ChromeFont(rb.GetFont(ResourceBundle::BaseFont));
+    dialog_button_font_ = new gfx::Font(rb.GetFont(ResourceBundle::BaseFont));
     initialized = true;
   }
 }
diff --git a/views/window/dialog_client_view.h b/views/window/dialog_client_view.h
index 347b61c..c1e6ed8 100644
--- a/views/window/dialog_client_view.h
+++ b/views/window/dialog_client_view.h
@@ -113,7 +113,7 @@ class DialogClientView : public ClientView,
 
   // Static resource initialization
   static void InitClass();
-  static ChromeFont* dialog_button_font_;
+  static gfx::Font* dialog_button_font_;
 
   DISALLOW_COPY_AND_ASSIGN(DialogClientView);
 };
diff --git a/views/window/window_win.cc b/views/window/window_win.cc
index c5c92c7..9c06e21 100644
--- a/views/window/window_win.cc
+++ b/views/window/window_win.cc
@@ -186,7 +186,7 @@ void WindowWin::PopForceHidden() {
 int Window::GetLocalizedContentsWidth(int col_resource_id) {
   double chars = _wtof(l10n_util::GetString(col_resource_id).c_str());
   ResourceBundle& rb = ResourceBundle::GetSharedInstance();
-  ChromeFont font = rb.GetFont(ResourceBundle::BaseFont);
+  gfx::Font font = rb.GetFont(ResourceBundle::BaseFont);
   int width = font.GetExpectedTextWidth(static_cast<int>(chars));
   DCHECK(width > 0);
   return width;
@@ -196,7 +196,7 @@ int Window::GetLocalizedContentsWidth(int col_resource_id) {
 int Window::GetLocalizedContentsHeight(int row_resource_id) {
   double lines = _wtof(l10n_util::GetString(row_resource_id).c_str());
   ResourceBundle& rb = ResourceBundle::GetSharedInstance();
-  ChromeFont font = rb.GetFont(ResourceBundle::BaseFont);
+  gfx::Font font = rb.GetFont(ResourceBundle::BaseFont);
   int height = static_cast<int>(font.height() * lines);
   DCHECK(height > 0);
   return height;