ChromeFont->gfx::Font...

views/controls/label.h

 // 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.
 
 #ifndef VIEWS_CONTROLS_LABEL_H_
 #define VIEWS_CONTROLS_LABEL_H_
 
 #include "app/gfx/chrome_font.h"
 #include "googleurl/src/gurl.h"
 #include "third_party/skia/include/core/SkColor.h"
@@ skipping 33 matching lines @@
 
   // The view class name.
   static const char kViewClassName[];
 
   // Create a new label with a default font and empty value
   Label();
 
   // 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();
 
   // Overridden to compute the size required to display this label
   virtual gfx::Size GetPreferredSize();
 
   // Return the height necessary to display this label with the provided width.
   // This method is used to layout multi-line labels. It is equivalent to
   // GetPreferredSize().height() if the receiver is not multi-line
   virtual int GetHeightForWidth(int w);
 
   // Returns views/Label.
   virtual std::string GetClassName() const;
 
   // Overridden to paint
   virtual void Paint(ChromeCanvas* canvas);
 
   // If the mouse is over the label, and a mouse over background has been
   // specified, its used. Otherwise super's implementation is invoked
   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);
 
   // Return the label text.
   const std::wstring GetText() const;
 
   // Set URL Value - text_ is set to spec().
   void SetURL(const GURL& url);
 
@@ skipping 94 matching lines @@
   void set_has_focus_border(bool has_focus_border) {
     has_focus_border_ = has_focus_border;
   }
 
  private:
   // These tests call CalculateDrawStringParams in order to verify the
   // calculations done for drawing text.
   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,
                                  gfx::Rect* text_bounds,
                                  int* flags);
 
   // If the mouse is over the text, SetContainsMouse(true) is invoked, otherwise
   // SetContainsMouse(false) is invoked.
   void UpdateContainsMouse(const MouseEvent& event);
 
   // Updates whether the mouse is contained in the Label. If the new value
   // differs from the current value, and a mouse over background is specified,
   // SchedulePaint is invoked.
   void SetContainsMouse(bool contains_mouse);
 
   // Returns where the text is drawn, in the receivers coordinate system.
   gfx::Rect GetTextBounds();
 
   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_;
   bool is_multi_line_;
   bool allow_character_break_;
   bool url_set_;
   Alignment horiz_alignment_;
   std::wstring tooltip_text_;
   // Whether the mouse is over this label.
   bool contains_mouse_;
@@ skipping 11 matching lines @@
   // allows this view to reserve space for a focus border that it otherwise
   // might not have because it is not itself focusable.
   bool has_focus_border_;
 
   DISALLOW_COPY_AND_ASSIGN(Label);
 };
 
 }  // namespace views
 
 #endif  // VIEWS_CONTROLS_LABEL_H_