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

ui/views/controls/label.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_LABEL_H_
 #define UI_VIEWS_CONTROLS_LABEL_H_
 
 #include <string>
 #include <vector>
 
@@ skipping 40 matching lines @@
 
   // Internal class name.
   static const char kViewClassName[];
 
   // The padding for the focus border when rendering focused text.
   static const int kFocusBorderPadding;
 
   Label();
   explicit Label(const base::string16& text);
   Label(const base::string16& text, const gfx::FontList& font_list);
-  Label(const base::string16& text, const gfx::Font& font);  // OBSOLETE
   virtual ~Label();
 
   // Gets or sets the fonts used by this label.
   const gfx::FontList& font_list() const { return font_list_; }
   virtual void SetFontList(const gfx::FontList& font_list);
-  // Obsolete gfx::Font version.  Should use gfx::FontList version instead.
-  const gfx::Font& font() const;  // OBSOLETE
-  virtual void SetFont(const gfx::Font& font);  // OBSOLETE
 
   // Get or set the label text.
   const base::string16& text() const { return text_; }
   virtual void SetText(const base::string16& text);
 
   // Enables or disables auto-color-readability (enabled by default).  If this
   // is enabled, then calls to set any foreground or background color will
   // trigger an automatic mapper that uses color_utils::GetReadableColor() to
   // ensure that the foreground colors are readable over the background color.
   void SetAutoColorReadabilityEnabled(bool enabled);
@@ skipping 202 matching lines @@
   // The cached heights to avoid recalculation in GetHeightForWidth().
   std::vector<gfx::Size> cached_heights_;
   int cached_heights_cursor_;
 
   DISALLOW_COPY_AND_ASSIGN(Label);
 };
 
 }  // namespace views
 
 #endif  // UI_VIEWS_CONTROLS_LABEL_H_