ChromeFont->gfx::Font...

views/window/custom_frame_view.cc

 // Copyright (c) 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 "views/window/custom_frame_view.h"
 
 #include "app/gfx/chrome_canvas.h"
 #include "app/gfx/chrome_font.h"
 #include "app/gfx/path.h"
 #include "app/resource_bundle.h"
 #include "app/theme_provider.h"
 #if defined(OS_WIN)
 #include "app/win_util.h"
 #include "base/win_util.h"
 #endif
 #include "grit/theme_resources.h"
 #include "views/window/client_view.h"
 #if defined(OS_LINUX)
 #include "views/window/hit_test.h"
 #endif
 #include "views/window/window_delegate.h"
 
 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
 // each side regardless of the system window border size.
 const int kFrameBorderThickness = 4;
 // Various edges of the frame border have a 1 px shadow along their edges; in a
 // few cases we shift elements based on this amount for visual appeal.
 const int kFrameShadowThickness = 1;
 // While resize areas on Windows are normally the same size as the window
 // borders, our top area is shrunk by 1 px to make it easier to move the window
@@ skipping 541 matching lines @@
       top_height,
       std::max(0, width() - (2 * border_thickness)),
       std::max(0, height() - top_height - border_thickness));
 }
 
 // static
 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;
   }
 }
 
 }  // namespace views