summaryrefslogtreecommitdiffstats
path: root/ash/sticky_keys/sticky_keys_overlay.h
diff options
context:
space:
mode:
authorthestig <thestig@chromium.org>2014-12-02 18:17:29 -0800
committerCommit bot <commit-bot@chromium.org>2014-12-03 02:18:17 +0000
commite94ef4a31d0591d11421fa34065d3bc0dcd1302a (patch)
tree9ee89654a8fb50cf2c9635e580cd7c14db9c6138 /ash/sticky_keys/sticky_keys_overlay.h
parent6450d054c6846df45ffb656c334d432f587a1dd3 (diff)
downloadchromium_src-e94ef4a31d0591d11421fa34065d3bc0dcd1302a.zip
chromium_src-e94ef4a31d0591d11421fa34065d3bc0dcd1302a.tar.gz
chromium_src-e94ef4a31d0591d11421fa34065d3bc0dcd1302a.tar.bz2
Revert of Speculative fix for sticky keys overlay crash. (patchset #2 id:20001 of https://codereview.chromium.org/754763005/)
Reason for revert: StickyKeysBrowserTest leaking memory. Original issue's description: > Speculative fix for sticky keys overlay crash. > > The new test case reproduces the same stack trace as in the bug, so it's very > probable that this case is causing the crash. > > BUG=435600 > > Committed: https://crrev.com/9391c0e45bc3ae50008d0aebf11437550e7f38c6 > Cr-Commit-Position: refs/heads/master@{#306504} TBR=jamescook@chromium.org,tengs@chromium.org NOTREECHECKS=true NOTRY=true BUG=435600 Review URL: https://codereview.chromium.org/757433005 Cr-Commit-Position: refs/heads/master@{#306529}
Diffstat (limited to 'ash/sticky_keys/sticky_keys_overlay.h')
-rw-r--r--ash/sticky_keys/sticky_keys_overlay.h6
1 files changed, 1 insertions, 5 deletions
diff --git a/ash/sticky_keys/sticky_keys_overlay.h b/ash/sticky_keys/sticky_keys_overlay.h
index 3ab23464..6391794 100644
--- a/ash/sticky_keys/sticky_keys_overlay.h
+++ b/ash/sticky_keys/sticky_keys_overlay.h
@@ -51,10 +51,6 @@ class ASH_EXPORT StickyKeysOverlay : public ui::LayerAnimationObserver {
// animating, the returned value is the target of the animation.
bool is_visible() { return is_visible_; }
- // Returns the underlying views::Widget for testing purposes. The returned
- // widget is owned by StickyKeysOverlay.
- views::Widget* GetWidgetForTesting();
-
private:
// Returns the current bounds of the overlay, which is based on visibility.
gfx::Rect CalculateOverlayBounds();
@@ -66,7 +62,7 @@ class ASH_EXPORT StickyKeysOverlay : public ui::LayerAnimationObserver {
bool is_visible_;
scoped_ptr<views::Widget> overlay_widget_;
- // The |overlay_view_| will be owned by |overlay_widget_|.
+ // Ownership of |overlay_view_| is passed to the view heirarchy.
StickyKeysOverlayView* overlay_view_;
gfx::Size widget_size_;
};