Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1287)

Unified Diff: ash/sticky_keys/sticky_keys_overlay.cc

Issue 142523003: Renames gfx::FontList::Derive* family. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Synced. Created 6 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ash/ime/infolist_window.cc ('k') | build/android/pylib/gtest/filter/ui_unittests_disabled » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/sticky_keys/sticky_keys_overlay.cc
diff --git a/ash/sticky_keys/sticky_keys_overlay.cc b/ash/sticky_keys/sticky_keys_overlay.cc
index 19e5acbcb517793488e9f287c269ba70bb68c524..ab07dcfa8aa232c23403b8e59ba5c29fa9797ccb 100644
--- a/ash/sticky_keys/sticky_keys_overlay.cc
+++ b/ash/sticky_keys/sticky_keys_overlay.cc
@@ -11,6 +11,7 @@
#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"
@@ -69,10 +70,11 @@ class StickyKeyOverlayLabel : public views::Label {
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));
@@ -102,7 +104,7 @@ void StickyKeyOverlayLabel::SetKeyState(StickyKeyState state) {
SetEnabledColor(label_color);
SetDisabledColor(label_color);
- SetFontList(font_list().DeriveFontListWithSizeDeltaAndStyle(0, style));
+ SetFontList(font_list().DeriveWithStyle(style));
}
void StickyKeyOverlayLabel::PaintText(gfx::Canvas* canvas,
« no previous file with comments | « ash/ime/infolist_window.cc ('k') | build/android/pylib/gtest/filter/ui_unittests_disabled » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698