ash/sticky_keys/sticky_keys_overlay.h - Issue 754763005: Speculative fix for sticky keys overlay crash.

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side Diff: ash/sticky_keys/sticky_keys_overlay.h

Issue 754763005: Speculative fix for sticky keys overlay crash. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 6 years 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 unified diff | Download patch

OLD	NEW
1 // Copyright 2014 The Chromium Authors. All rights reserved.	1 // Copyright 2014 The Chromium Authors. All rights reserved.

2 // Use of this source code is governed by a BSD-style license that can be	2 // Use of this source code is governed by a BSD-style license that can be

3 // found in the LICENSE file.	3 // found in the LICENSE file.

4	4

5 #ifndef ASH_STICKY_KEYS_STICKY_KEYS_OVERLAY_H_	5 #ifndef ASH_STICKY_KEYS_STICKY_KEYS_OVERLAY_H_

6 #define ASH_STICKY_KEYS_STICKY_KEYS_OVERLAY_H_	6 #define ASH_STICKY_KEYS_STICKY_KEYS_OVERLAY_H_

7	7

8 #include "ash/ash_export.h"	8 #include "ash/ash_export.h"

9 #include "ash/sticky_keys/sticky_keys_state.h"	9 #include "ash/sticky_keys/sticky_keys_state.h"

10 #include "base/memory/scoped_ptr.h"	10 #include "base/memory/scoped_ptr.h"

(...skipping 43 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
54 private:	54 private:

55 // Returns the current bounds of the overlay, which is based on visibility.	55 // Returns the current bounds of the overlay, which is based on visibility.

56 gfx::Rect CalculateOverlayBounds();	56 gfx::Rect CalculateOverlayBounds();

57	57

58 // gfx::LayerAnimationObserver overrides:	58 // gfx::LayerAnimationObserver overrides:

59 void OnLayerAnimationEnded(ui::LayerAnimationSequence* sequence) override;	59 void OnLayerAnimationEnded(ui::LayerAnimationSequence* sequence) override;

60 void OnLayerAnimationAborted(ui::LayerAnimationSequence* sequence) override;	60 void OnLayerAnimationAborted(ui::LayerAnimationSequence* sequence) override;

61 void OnLayerAnimationScheduled(ui::LayerAnimationSequence* sequence) override;	61 void OnLayerAnimationScheduled(ui::LayerAnimationSequence* sequence) override;

62	62

63 bool is_visible_;	63 bool is_visible_;

	64 // Note: keep the order the same. \|overlay_view_\| must outlive

	65 // \|overlay_widget_\|.

	66 scoped_ptr<StickyKeysOverlayView> overlay_view_;

64 scoped_ptr<views::Widget> overlay_widget_;	67 scoped_ptr<views::Widget> overlay_widget_;

65 // Ownership of \|overlay_view_\| is passed to the view heirarchy.

66 StickyKeysOverlayView* overlay_view_;

67 gfx::Size widget_size_;	68 gfx::Size widget_size_;

68 };	69 };

69	70

70 } // namespace ash	71 } // namespace ash

71	72

72 #endif // ASH_STICKY_KEYS_STICKY_KEYS_OVERLAY_H_	73 #endif // ASH_STICKY_KEYS_STICKY_KEYS_OVERLAY_H_

OLD	NEW

« no previous file with comments | « ash/root_window_controller.cc ('k') | ash/sticky_keys/sticky_keys_overlay.cc » ('j') | ash/sticky_keys/sticky_keys_overlay_unittest.cc » ('J')