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 40 matching lines @@
 
   StickyKeyState state_;
 
   DISALLOW_COPY_AND_ASSIGN(StickyKeyOverlayLabel);
 };
 
 StickyKeyOverlayLabel::StickyKeyOverlayLabel(const std::string& key_name)
     : state_(STICKY_KEY_STATE_DISABLED) {
   SetText(base::UTF8ToUTF16(key_name));
   SetHorizontalAlignment(gfx::ALIGN_LEFT);
-  SetFontList(
-      font_list().DeriveFontListWithSize(18));
+  SetFontList(font_list().DeriveWithSizeDelta(4));

[Alexei Svitkine (slow), 2014/01/23 18:47:54]

Can you comment where the 4 comes from? Are you sure this doesn't result in a
change of behaviour? (i.e. was font list size always 14 on all platforms
before)?

[Yuki, 2014/01/24 10:23:20]

The default font size depends on platforms and user's settings.  But it's about
14px in most cases, I think.  I wasn't sure if we should use MediumFont (+3px)
or not.  I'm now inclined to MediumFont.

For the reason why +4px, I cannot tell you the reason because I don't know why
it was 18px.  Probably there's no special reason.

If you're okay, can I specify MediumFont here?

My point is that we shouldn't specify the absolute font size as much as
possible.
For this case, the original author surely meant this label to be larger than the
default text, but it's possible that this label could be smaller than the
default text if the default font is enough large.

[Alexei Svitkine (slow), 2014/01/24 15:53:41]

I agree with the motivation and also agree that if we could use MediumFont, it
would be better. However, I'm worried that making these changes blindly will
regress some UI. So I'd rather you double check this (i.e. post screenshots of
before and after for this view) to make sure it still looks ok after the change.

[Yuki, 2014/01/27 07:03:49]

Here are screenshots (on Pixel).  I took screenshots of the full screen so you
can get a feeling compared to other text.  You can see the sticky keys'
indicator at top-left corner.

Original 18px font:
https://docs.google.com/a/chromium.org/file/d/0B3Ozb9XcozcMekt2djE0bnlnMkU/view

MediumFont:
https://docs.google.com/a/chromium.org/file/d/0B3Ozb9XcozcMRXcxZ2RhSlIwOUE/view

LargeFont:
https://docs.google.com/a/chromium.org/file/d/0B3Ozb9XcozcMcDUtYlFSVHZPUXM/view

After taking screenshots, I think the LargeFont is best.  Let me use LargeFont
here, if you guys are okay.

[Alexei Svitkine (slow), 2014/01/27 16:00:38]

Thanks for checking!

Switching to LargeFont indeed seems fine to me here. (Though to be certain, you
might want to double check with the feature author.)

   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().Derive(0, 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