Renames gfx::FontList::Derive* family.

ash/sticky_keys/sticky_keys_overlay.cc

 // Copyright 2014 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 "ash/sticky_keys/sticky_keys_overlay.h"
 
 #include "ash/shell.h"
 #include "ash/shell_window_ids.h"
 #include "ash/sticky_keys/sticky_keys_controller.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "grit/ash_strings.h"
 #include "ui/base/l10n/l10n_util.h"
+#include "ui/base/resource/resource_bundle.h"
 #include "ui/compositor/scoped_layer_animation_settings.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/font_list.h"
 #include "ui/views/border.h"
 #include "ui/views/controls/label.h"
 #include "ui/views/layout/box_layout.h"
 #include "ui/views/view.h"
 #include "ui/views/widget/widget.h"
 #include "ui/views/widget/widget_delegate.h"
 
@@ skipping 38 matching lines @@
                          const gfx::Rect& text_bounds,
                          int flags) OVERRIDE;
 
   StickyKeyState state_;
 
   DISALLOW_COPY_AND_ASSIGN(StickyKeyOverlayLabel);
 };
 
 StickyKeyOverlayLabel::StickyKeyOverlayLabel(const std::string& key_name)
     : state_(STICKY_KEY_STATE_DISABLED) {
+  ui::ResourceBundle* rb = &ui::ResourceBundle::GetSharedInstance();
+
   SetText(base::UTF8ToUTF16(key_name));
   SetHorizontalAlignment(gfx::ALIGN_LEFT);
-  SetFontList(
-      font_list().DeriveFontListWithSize(18));
+  SetFontList(rb->GetFontList(ui::ResourceBundle::LargeFont));
   SetAutoColorReadabilityEnabled(false);
   SetFocusable(false);
   SetEnabledColor(SkColorSetARGB(0x80, 0xFF, 0xFF, 0xFF));
   SetDisabledColor(SkColorSetARGB(0x80, 0xFF, 0xFF, 0xFF));
 }
 
 StickyKeyOverlayLabel::~StickyKeyOverlayLabel() {
 }
 
 void StickyKeyOverlayLabel::SetKeyState(StickyKeyState state) {
   state_ = state;
   SkColor label_color;
   int style;
   switch (state) {
     case STICKY_KEY_STATE_ENABLED:
       style = gfx::Font::NORMAL;
       label_color = SkColorSetA(enabled_color(), 0xFF);
       break;
     case STICKY_KEY_STATE_LOCKED:
       style = gfx::Font::UNDERLINE;
       label_color = SkColorSetA(enabled_color(), 0xFF);
       break;
     default:
       style = gfx::Font::NORMAL;
       label_color = SkColorSetA(enabled_color(), 0x80);
   }
 
   SetEnabledColor(label_color);
   SetDisabledColor(label_color);
-  SetFontList(font_list().DeriveFontListWithSizeDeltaAndStyle(0, style));
+  SetFontList(font_list().DeriveWithStyle(style));
 }
 
 void StickyKeyOverlayLabel::PaintText(gfx::Canvas* canvas,
                                       const base::string16& text,
                                       const gfx::Rect& text_bounds,
                                       int flags) {
   views::Label::PaintText(canvas,
                           text,
                           text_bounds,
                           flags | gfx::Canvas::NO_SUBPIXEL_RENDERING);
@@ skipping 158 matching lines @@
   ui::LayerAnimator* animator = overlay_widget_->GetLayer()->GetAnimator();
   if (animator)
     animator->RemoveObserver(this);
 }
 
 void StickyKeysOverlay::OnLayerAnimationScheduled(
     ui::LayerAnimationSequence* sequence) {
 }
 
 }  // namespace ash