Clean-up: Retires obsolete methods in views::Label and views::TextButtonBase.

ui/views/controls/button/text_button.h

 // Copyright (c) 2012 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 UI_VIEWS_CONTROLS_BUTTON_TEXT_BUTTON_H_
 #define UI_VIEWS_CONTROLS_BUTTON_TEXT_BUTTON_H_
 
 #include <string>
 
 #include "base/compiler_specific.h"
@@ skipping 127 matching lines @@
   // TextButton remembers the maximum display size of the text passed to
   // SetText. This method resets the cached maximum display size to the
   // current size.
   void ClearMaxTextSize();
 
   void set_min_width(int min_width) { min_width_ = min_width; }
   void set_min_height(int min_height) { min_height_ = min_height; }
   void set_max_width(int max_width) { max_width_ = max_width; }
   const gfx::FontList& font_list() const { return font_list_; }
   void SetFontList(const gfx::FontList& font_list);
-  // Obsolete versions.
-  const gfx::Font& font() const;
-  void SetFont(const gfx::Font& font);
 
   void SetEnabledColor(SkColor color);
   void SetDisabledColor(SkColor color);
   void SetHighlightColor(SkColor color);
   void SetHoverColor(SkColor color);
 
   // Enables a drop shadow underneath the text.
   void SetTextShadowColors(SkColor active_color, SkColor inactive_color);
 
   // Sets the drop shadow's offset from the text.
@@ skipping 85 matching lines @@
   // The size of the text string.
   gfx::Size text_size_;
 
   // Track the size of the largest text string seen so far, so that
   // changing text_ will not resize the button boundary.
   gfx::Size max_text_size_;
 
   // The alignment of the text string within the button.
   TextAlignment alignment_;
 
-  // The font used to paint the text.
+  // The font list used to paint the text.
   gfx::FontList font_list_;
 
   // Flag indicating if a shadow should be drawn behind the text.
   bool has_text_shadow_;
   // Optional shadow text colors for active and inactive widget states.
   SkColor active_text_shadow_color_;
   SkColor inactive_text_shadow_color_;
   // Space between the text and its shadow. Defaults to (1,1).
   gfx::Point text_shadow_offset_;
 
@@ skipping 116 matching lines @@
   // True if the button should ignore the minimum size for the platform. Default
   // is true. Set to false to prevent narrower buttons.
   bool ignore_minimum_size_;
 
   DISALLOW_COPY_AND_ASSIGN(TextButton);
 };
 
 }  // namespace views
 
 #endif  // UI_VIEWS_CONTROLS_BUTTON_TEXT_BUTTON_H_