ChromeFont->gfx::Font...

views/controls/label.h

Index: views/controls/label.h
===================================================================
--- views/controls/label.h	(revision 16106)
+++ views/controls/label.h	(working copy)
@@ -51,7 +51,7 @@
   // Create a new label with a default font
   explicit Label(const std::wstring& text);
 
-  Label(const std::wstring& text, const ChromeFont& font);
+  Label(const std::wstring& text, const gfx::Font& font);
 
   virtual ~Label();
 
@@ -74,10 +74,10 @@
   virtual void PaintBackground(ChromeCanvas* canvas);
 
   // Set the font.
-  void SetFont(const ChromeFont& font);
+  void SetFont(const gfx::Font& font);
 
   // Return the font used by this label
-  ChromeFont GetFont() const;
+  gfx::Font GetFont() const;
 
   // Set the label text.
   void SetText(const std::wstring& text);
@@ -192,7 +192,7 @@
   FRIEND_TEST(LabelTest, DrawSingleLineString);
   FRIEND_TEST(LabelTest, DrawMultiLineString);
 
-  static ChromeFont GetDefaultFont();
+  static gfx::Font GetDefaultFont();
 
   // Returns parameters to be used for the DrawString call.
   void CalculateDrawStringParams(std::wstring* paint_text,
@@ -213,10 +213,10 @@
 
   int ComputeMultiLineFlags();
   gfx::Size GetTextSize();
-  void Init(const std::wstring& text, const ChromeFont& font);
+  void Init(const std::wstring& text, const gfx::Font& font);
   std::wstring text_;
   GURL url_;
-  ChromeFont font_;
+  gfx::Font font_;
   SkColor color_;
   gfx::Size text_size_;
   bool text_size_valid_;