ChromeFont->gfx::Font...

views/drag_utils.cc

 // Copyright (c) 2006-2008 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/drag_utils.h"
 
 #include <objidl.h>
 #include <shlobj.h>
 #include <shobjidl.h>
 
@@ skipping 100 matching lines @@
 
 void CreateDragImageForFile(const std::wstring& file_name,
                             SkBitmap* icon,
                             IDataObject* data_object) {
   DCHECK(icon);
   DCHECK(data_object);
 
   // Set up our text portion
   const std::wstring& name = file_util::GetFilenameFromPath(file_name);
   ResourceBundle& rb = ResourceBundle::GetSharedInstance();
-  ChromeFont font = rb.GetFont(ResourceBundle::BaseFont);
+  gfx::Font font = rb.GetFont(ResourceBundle::BaseFont);
 
   const int width = kFileDragImageMaxWidth;
   // Add +2 here to allow room for the halo.
   const int height = font.height() + icon->height() +
                      kLinkDragImageVPadding + 2;
   ChromeCanvas canvas(width, height, false /* translucent */);
 
   // Paint the icon.
   canvas.DrawBitmapInt(*icon, (width - icon->width()) / 2, 0);
 
@@ skipping 18 matching lines @@
   HBITMAP bitmap = CreateBitmapFromCanvas(canvas, width, height);
 
   // Attach 'bitmap' to the data_object.
   SetDragImageOnDataObject(bitmap, width, height,
                            cursor_x_offset,
                            cursor_y_offset,
                            data_object);
 }
 
 } // namespace drag_utils