Remove Label::PaintText overrides.

This is simple cleanup in preparation for a Label rewrite.
These overrides were supplying an extra gfx::Canvas flag.
Instead, add an explicit label flag for NO_SUBPIXEL_RENDERING.
Update some callers and the unit test.

TODO(followup): Update more Label::SetBackgroundColor callers.

BUG=240037
TEST=No exit warning or sticky keys label rendering changes.
R=sky@chromium.org

Review URL: https://codereview.chromium.org/341713002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@278213 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 4 insertions, 40 deletions

diff --git a/ash/accelerators/exit_warning_handler.cc b/ash/accelerators/exit_warning_handler.cc
index d2dc0f5..d01466b 100644
--- a/ash/accelerators/exit_warning_handler.cc
+++ b/ash/accelerators/exit_warning_handler.cc
@@ -38,27 +38,6 @@ const int kWindowCornerRadius = 2;
 const int kHorizontalMarginAroundText = 100;
 const int kVerticalMarginAroundText = 100;
 
-class ExitWarningLabel : public views::Label {
- public:
-  ExitWarningLabel() {}
-
-  virtual ~ExitWarningLabel() {}
-
- private:
-  virtual void PaintText(gfx::Canvas* canvas,
-                         const base::string16& text,
-                         const gfx::Rect& text_bounds,
-                         int flags) OVERRIDE {
-    // Turn off subpixel rendering.
-    views::Label::PaintText(canvas,
-                            text,
-                            text_bounds,
-                            flags | gfx::Canvas::NO_SUBPIXEL_RENDERING);
-  }
-
-  DISALLOW_COPY_AND_ASSIGN(ExitWarningLabel);
-};
-
 class ExitWarningWidgetDelegateView : public views::WidgetDelegateView {
  public:
   ExitWarningWidgetDelegateView() : text_width_(0), width_(0), height_(0) {
@@ -77,13 +56,14 @@ class ExitWarningWidgetDelegateView : public views::WidgetDelegateView {
     text_width_ = gfx::GetStringWidth(text_, font_list);
     width_ = text_width_ + kHorizontalMarginAroundText;
     height_ = font_list.GetHeight() + kVerticalMarginAroundText;
-    views::Label* label = new ExitWarningLabel;
+    views::Label* label = new views::Label();
     label->SetText(text_);
     label->SetHorizontalAlignment(gfx::ALIGN_CENTER);
     label->SetFontList(font_list);
     label->SetEnabledColor(kTextColor);
     label->SetDisabledColor(kTextColor);
     label->SetAutoColorReadabilityEnabled(false);
+    label->set_subpixel_rendering_enabled(false);
     AddChildView(label);
     SetLayoutManager(new views::FillLayout);
   }
diff --git a/ash/sticky_keys/sticky_keys_overlay.cc b/ash/sticky_keys/sticky_keys_overlay.cc
index 7720ad6..c68f227 100644
--- a/ash/sticky_keys/sticky_keys_overlay.cc
+++ b/ash/sticky_keys/sticky_keys_overlay.cc
@@ -54,12 +54,6 @@ class StickyKeyOverlayLabel : public views::Label {
   void SetKeyState(StickyKeyState state);
 
  private:
-  // views::Label overrides:
-  virtual void PaintText(gfx::Canvas* canvas,
-                         const base::string16& text,
-                         const gfx::Rect& text_bounds,
-                         int flags) OVERRIDE;
-
   StickyKeyState state_;
 
   DISALLOW_COPY_AND_ASSIGN(StickyKeyOverlayLabel);
@@ -76,6 +70,7 @@ StickyKeyOverlayLabel::StickyKeyOverlayLabel(const std::string& key_name)
   SetFocusable(false);
   SetEnabledColor(SkColorSetARGB(0x80, 0xFF, 0xFF, 0xFF));
   SetDisabledColor(SkColorSetARGB(0x80, 0xFF, 0xFF, 0xFF));
+  set_subpixel_rendering_enabled(false);
 }
 
 StickyKeyOverlayLabel::~StickyKeyOverlayLabel() {
@@ -104,19 +99,8 @@ void StickyKeyOverlayLabel::SetKeyState(StickyKeyState state) {
   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);
-}
-
-
 ///////////////////////////////////////////////////////////////////////////////
-//  StickyKeyOverlayLabel
+//  StickyKeysOverlayView
 class StickyKeysOverlayView : public views::WidgetDelegateView {
  public:
   StickyKeysOverlayView();