Revert of Speculative fix for sticky keys overlay crash.

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 91 matching lines @@
 ///////////////////////////////////////////////////////////////////////////////
 //  StickyKeysOverlayView
 class StickyKeysOverlayView : public views::WidgetDelegateView {
  public:
   StickyKeysOverlayView();
 
   ~StickyKeysOverlayView() override;
 
   // views::WidgetDelegateView overrides:
   void OnPaint(gfx::Canvas* canvas) override;
-  void DeleteDelegate() override;
 
   void SetKeyState(ui::EventFlags modifier, StickyKeyState state);
 
   StickyKeyState GetKeyState(ui::EventFlags modifier);
 
   void SetModifierVisible(ui::EventFlags modifier, bool visible);
   bool GetModifierVisible(ui::EventFlags modifier);
 
  private:
   void AddKeyLabel(ui::EventFlags modifier, const std::string& key_label);
@@ skipping 37 matching lines @@
 StickyKeysOverlayView::~StickyKeysOverlayView() {}
 
 void StickyKeysOverlayView::OnPaint(gfx::Canvas* canvas) {
   SkPaint paint;
   paint.setStyle(SkPaint::kFill_Style);
   paint.setColor(SkColorSetARGB(0xB3, 0x55, 0x55, 0x55));
   canvas->DrawRoundRect(GetLocalBounds(), 2, paint);
   views::WidgetDelegateView::OnPaint(canvas);
 }
 
-void StickyKeysOverlayView::DeleteDelegate() {
-  // The ownership of a WidgetDelegateView is kind of tricky. It has the
-  // lifetime semantics of both a View and a WidgetDelegate. We should just rely
-  // on the Views semantics and do nothing here. This object will be deleted
-  // when the parent widget is deleted.
-}
-
 void StickyKeysOverlayView::SetKeyState(ui::EventFlags modifier,
                                         StickyKeyState state) {
   ModifierLabelMap::iterator it = modifier_label_map_.find(modifier);
   DCHECK(it != modifier_label_map_.end());
   if (it != modifier_label_map_.end()) {
     StickyKeyOverlayLabel* label = it->second;
     label->SetKeyState(state);
   }
 }
 
@@ skipping 93 matching lines @@
 void StickyKeysOverlay::SetModifierKeyState(ui::EventFlags modifier,
                                             StickyKeyState state) {
   overlay_view_->SetKeyState(modifier, state);
 }
 
 StickyKeyState StickyKeysOverlay::GetModifierKeyState(
     ui::EventFlags modifier) {
   return overlay_view_->GetKeyState(modifier);
 }
 
-views::Widget* StickyKeysOverlay::GetWidgetForTesting() {
-  return overlay_widget_.get();
-}
-
 gfx::Rect StickyKeysOverlay::CalculateOverlayBounds() {
   int x = is_visible_ ? kHorizontalOverlayOffset : -widget_size_.width();
   return gfx::Rect(gfx::Point(x, kVerticalOverlayOffset), widget_size_);
 }
 
 void StickyKeysOverlay::OnLayerAnimationEnded(
     ui::LayerAnimationSequence* sequence) {
   ui::LayerAnimator* animator = overlay_widget_->GetLayer()->GetAnimator();
   if (animator)
     animator->RemoveObserver(this);
   if (!is_visible_)
     overlay_widget_->Hide();
 }
 
 void StickyKeysOverlay::OnLayerAnimationAborted(
     ui::LayerAnimationSequence* sequence) {
   ui::LayerAnimator* animator = overlay_widget_->GetLayer()->GetAnimator();
   if (animator)
     animator->RemoveObserver(this);
 }
 
 void StickyKeysOverlay::OnLayerAnimationScheduled(
     ui::LayerAnimationSequence* sequence) {
 }
 
 }  // namespace ash