ChromeFont->gfx::Font...

views/controls/button/native_button.h

 // 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.
 
 #ifndef VIEWS_CONTROLS_BUTTON_NATIVE_BUTTON_H_
 #define VIEWS_CONTROLS_BUTTON_NATIVE_BUTTON_H_
 
 #include "app/gfx/chrome_font.h"
 #include "views/controls/button/button.h"
 #include "views/controls/button/native_button_wrapper.h"
 
-class ChromeFont;
+namespace gfx {
+class Font;
+}
 
 namespace views {
 
 class NativeButton : public Button {
  public:
   // The button's class name.
   static const char kViewClassName[];
 
   explicit NativeButton(ButtonListener* listener);
   NativeButton(ButtonListener* listener, const std::wstring& label);
   virtual ~NativeButton();
 
   // Sets/Gets the text to be used as the button's label.
   void SetLabel(const std::wstring& label);
   std::wstring label() const { return label_; }
 
   // Sets the font to be used when displaying the button's label.
-  void set_font(const ChromeFont& font) { font_ = font; }
-  const ChromeFont& font() const { return font_; }
+  void set_font(const gfx::Font& font) { font_ = font; }
+  const gfx::Font& font() const { return font_; }
 
   // Sets/Gets whether or not the button appears and behaves as the default
   // button in its current context.
   void SetIsDefault(bool default_button);
   bool is_default() const { return is_default_; }
 
   // Sets whether or not the button appears as the default button. This does
   // not make it behave as the default (i.e. no enter key accelerator is
   // registered, use SetIsDefault for that).
   void SetAppearsAsDefault(bool default_button);
@@ skipping 31 matching lines @@
   NativeButtonWrapper* native_wrapper_;
 
  private:
   // The button label.
   std::wstring label_;
 
   // True if the button is the default button in its context.
   bool is_default_;
 
   // The font used to render the button label.
-  ChromeFont font_;
+  gfx::Font font_;
 
   // True if the button should ignore the minimum size for the platform. Default
   // is false. Set to true to create narrower buttons.
   bool ignore_minimum_size_;
 
   // The minimum size of the button from the specified size in native dialog
   // units. The definition of this unit may vary from platform to platform. If
   // the width/height is non-zero, the preferred size of the button will not be
   // less than this value when the dialog units are converted to pixels.
   gfx::Size minimum_size_;
 
   DISALLOW_COPY_AND_ASSIGN(NativeButton);
 };
 
 }  // namespace views
 
 #endif  // #ifndef VIEWS_CONTROLS_BUTTON_NATIVE_BUTTON_H_