ui/gfx/compositor/scoped_layer_animation_settings.h - Issue 9222018: reland -- Disable animations during aura tests.

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

Unified Diff: ui/gfx/compositor/scoped_layer_animation_settings.h

Issue 9222018: reland -- Disable animations during aura tests. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: . Created 8 years, 11 months ago

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

Jump to:

Index: ui/gfx/compositor/scoped_layer_animation_settings.h

diff --git a/ui/gfx/compositor/scoped_layer_animation_settings.h b/ui/gfx/compositor/scoped_layer_animation_settings.h

index 2f900552fe62d8d094690886310c832a18a92b2a..dce64ef4a6430250539d33addbf964f3f42d02b4 100644

--- a/ui/gfx/compositor/scoped_layer_animation_settings.h

+++ b/ui/gfx/compositor/scoped_layer_animation_settings.h

@@ -27,15 +27,13 @@ class COMPOSITOR_EXPORT ScopedLayerAnimationSettings {

explicit ScopedLayerAnimationSettings(LayerAnimator* animator);

virtual ~ScopedLayerAnimationSettings();

- void AddObserver(LayerAnimationObserver* observer);

- void AddImplicitObserver(ImplicitAnimationObserver* observer);

+ void AddObserver(ImplicitAnimationObserver* observer);

void SetTransitionDuration(base::TimeDelta duration);

private:

LayerAnimator* animator_;

base::TimeDelta old_transition_duration_;

- std::set<LayerAnimationObserver*> observers_;

- std::set<ImplicitAnimationObserver*> implicit_observers_;

+ std::set<ImplicitAnimationObserver*> observers_;

DISALLOW_COPY_AND_ASSIGN(ScopedLayerAnimationSettings);

};