Remove Label::PaintText overrides.

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"
@@ skipping 36 matching lines @@
  public:
   explicit StickyKeyOverlayLabel(const std::string& key_name);
 
   virtual ~StickyKeyOverlayLabel();
 
   StickyKeyState state() const { return state_; }
 
   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);
 };
 
 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(rb->GetFontList(kKeyLabelFontStyle));
   SetAutoColorReadabilityEnabled(false);
   SetFocusable(false);
   SetEnabledColor(SkColorSetARGB(0x80, 0xFF, 0xFF, 0xFF));
   SetDisabledColor(SkColorSetARGB(0x80, 0xFF, 0xFF, 0xFF));
+  set_subpixel_rendering_enabled(false);
 }
 
 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().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();
 
   virtual ~StickyKeysOverlayView();
 
   // views::WidgetDelegateView overrides:
   virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE;
 
   void SetKeyState(ui::EventFlags modifier, StickyKeyState state);
@@ skipping 182 matching lines @@
   ui::LayerAnimator* animator = overlay_widget_->GetLayer()->GetAnimator();
   if (animator)
     animator->RemoveObserver(this);
 }
 
 void StickyKeysOverlay::OnLayerAnimationScheduled(
     ui::LayerAnimationSequence* sequence) {
 }
 
 }  // namespace ash