ChromeFont->gfx::Font...

app/gfx/chrome_canvas.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 "app/gfx/chrome_canvas.h"
 
 #include <limits>
 
 #include "app/gfx/chrome_font.h"
 #include "app/l10n_util.h"
@@ skipping 199 matching lines @@
   SkPaint p(paint);
   p.setFilterBitmap(filter);
   p.setShader(shader);
   shader->unref();
 
   // The rect will be filled by the bitmap.
   drawRect(dest_rect, p);
 }
 
 void ChromeCanvas::DrawStringInt(const std::wstring& text,
-                                 const ChromeFont& font,
+                                 const gfx::Font& font,
                                  const SkColor& color,
                                  int x, int y,
                                  int w, int h) {
   DrawStringInt(text, font, color, x, y, w, h,
                 l10n_util::DefaultCanvasTextAlignment());
 }
 
 void ChromeCanvas::TileImageInt(const SkBitmap& bitmap,
                                 int x, int y, int w, int h) {
   TileImageInt(bitmap, 0, 0, x, y, w, h);
@@ skipping 25 matching lines @@
 SkBitmap ChromeCanvas::ExtractBitmap() {
   const SkBitmap& device_bitmap = getDevice()->accessBitmap(false);
 
   // Make a bitmap to return, and a canvas to draw into it. We don't just want
   // to call extractSubset or the copy constuctor, since we want an actual copy
   // of the bitmap.
   SkBitmap result;
   device_bitmap.copyTo(&result, SkBitmap::kARGB_8888_Config);
   return result;
 }