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

ui/views/controls/label.cc

 // 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.
 
 #include "ui/views/controls/label.h"
 
 #include <algorithm>
 #include <cmath>
 #include <limits>
 #include <vector>
@@ skipping 11 matching lines @@
 #include "ui/gfx/shadow_value.h"
 #include "ui/gfx/text_elider.h"
 #include "ui/gfx/text_utils.h"
 #include "ui/native_theme/native_theme.h"
 #include "ui/views/background.h"
 
 namespace {
 
 const int kCachedSizeLimit = 10;
 
-gfx::FontList GetDefaultFontList() {
-  return ui::ResourceBundle::GetSharedInstance().GetFontList(
-      ui::ResourceBundle::BaseFont);
-}
-
 }  // namespace
 
 namespace views {
 
 // static
 const char Label::kViewClassName[] = "Label";
 const int Label::kFocusBorderPadding = 1;
 
 Label::Label() {
-  Init(base::string16(), GetDefaultFontList());
+  Init(base::string16(), gfx::FontList());

[sadrul, 2014/01/06 18:41:04]

Is this gfx::FontList() equivalent to the default font-list from the
ResourceBundle?

[Yuki, 2014/01/07 02:28:36]

Yes, it's now equivalent.

[sadrul, 2014/01/07 02:35:32]

Considering crbug.com/330975, if we get the FontList from the ResourceBundle,
then the FontList here will inherit the cached FontList attributes (e.g.
height), but if we create a new instance of FontList (as you do with this
patch), we lose that, and it would have to recompute that information. Is that
correct? Wouldn't that cause more perf issues?

[Yuki, 2014/01/07 02:41:32]

That's a good point.  Let me address the issue first.

[Yuki, 2014/01/07 13:00:53]

Just FYI, I've sent out a CL: http://crrev.com/124693003

 }
 
 Label::Label(const base::string16& text) {
-  Init(text, GetDefaultFontList());
+  Init(text, gfx::FontList());
 }
 
 Label::Label(const base::string16& text, const gfx::FontList& font_list) {
   Init(text, font_list);
 }
 
-Label::Label(const base::string16& text, const gfx::Font& font) {
-  Init(text, gfx::FontList(font));
-}
-
 Label::~Label() {
 }
 
 void Label::SetFontList(const gfx::FontList& font_list) {
   font_list_ = font_list;
   ResetCachedSize();
   PreferredSizeChanged();
   SchedulePaint();
 }
 
-const gfx::Font& Label::font() const {
-  return font_list_.GetPrimaryFont();
-}
-
-void Label::SetFont(const gfx::Font& font) {
-  SetFontList(gfx::FontList(font));
-}
-
 void Label::SetText(const base::string16& text) {
   if (text == text_)
     return;
   text_ = text;
   ResetCachedSize();
   PreferredSizeChanged();
   SchedulePaint();
 }
 
 void Label::SetAutoColorReadabilityEnabled(bool enabled) {
@@ skipping 448 matching lines @@
   for (int i = 0; i < kCachedSizeLimit; ++i)
     cached_heights_[i] = gfx::Size();
 }
 
 bool Label::ShouldShowDefaultTooltip() const {
   return !is_multi_line_ &&
       gfx::GetStringWidth(text_, font_list_) > GetAvailableRect().width();
 }
 
 }  // namespace views