Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(282)

Side by Side Diff: ui/compositor/scoped_layer_animation_settings.h

Issue 10365007: ui: Move compositor/ directory out of gfx/, up to ui/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix DEPS Created 8 years, 7 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:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « ui/compositor/run_all_unittests.cc ('k') | ui/compositor/scoped_layer_animation_settings.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 UI_GFX_COMPOSITOR_SCOPED_LAYER_ANIMATION_SETTINGS_H_ 5 #ifndef UI_COMPOSITOR_SCOPED_LAYER_ANIMATION_SETTINGS_H_
6 #define UI_GFX_COMPOSITOR_SCOPED_LAYER_ANIMATION_SETTINGS_H_ 6 #define UI_COMPOSITOR_SCOPED_LAYER_ANIMATION_SETTINGS_H_
7 #pragma once 7 #pragma once
8 8
9 #include <set> 9 #include <set>
10 10
11 #include "base/time.h" 11 #include "base/time.h"
12 12
13 #include "ui/base/animation/tween.h" 13 #include "ui/base/animation/tween.h"
14 #include "ui/gfx/compositor/compositor_export.h" 14 #include "ui/compositor/compositor_export.h"
15 #include "ui/gfx/compositor/layer_animator.h" 15 #include "ui/compositor/layer_animator.h"
16 16
17 namespace ui { 17 namespace ui {
18 18
19 class ImplicitAnimationObserver; 19 class ImplicitAnimationObserver;
20 class LayerAnimationObserver; 20 class LayerAnimationObserver;
21 21
22 // Scoped settings allow you to temporarily change the animator's settings and 22 // Scoped settings allow you to temporarily change the animator's settings and
23 // these changes are reverted when the object is destroyed. NOTE: when the 23 // these changes are reverted when the object is destroyed. NOTE: when the
24 // settings object is created, it applies the default transition duration 24 // settings object is created, it applies the default transition duration
25 // (200ms). 25 // (200ms).
(...skipping 18 matching lines...) Expand all
44 base::TimeDelta old_transition_duration_; 44 base::TimeDelta old_transition_duration_;
45 Tween::Type old_tween_type_; 45 Tween::Type old_tween_type_;
46 LayerAnimator::PreemptionStrategy old_preemption_strategy_; 46 LayerAnimator::PreemptionStrategy old_preemption_strategy_;
47 std::set<ImplicitAnimationObserver*> observers_; 47 std::set<ImplicitAnimationObserver*> observers_;
48 48
49 DISALLOW_COPY_AND_ASSIGN(ScopedLayerAnimationSettings); 49 DISALLOW_COPY_AND_ASSIGN(ScopedLayerAnimationSettings);
50 }; 50 };
51 51
52 } // namespace ui 52 } // namespace ui
53 53
54 #endif // UI_GFX_COMPOSITOR_SCOPED_LAYER_ANIMATION_SETTINGS_H_ 54 #endif // UI_COMPOSITOR_SCOPED_LAYER_ANIMATION_SETTINGS_H_
OLDNEW
« no previous file with comments | « ui/compositor/run_all_unittests.cc ('k') | ui/compositor/scoped_layer_animation_settings.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698