| OLD | NEW |
| 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 #include "ui/gfx/compositor/scoped_layer_animation_settings.h" | 5 #include "ui/compositor/scoped_layer_animation_settings.h" |
| 6 | 6 |
| 7 #include "ui/gfx/compositor/layer_animation_observer.h" | 7 #include "ui/compositor/layer_animation_observer.h" |
| 8 #include "ui/gfx/compositor/layer_animator.h" | 8 #include "ui/compositor/layer_animator.h" |
| 9 | 9 |
| 10 namespace { | 10 namespace { |
| 11 | 11 |
| 12 static const base::TimeDelta kDefaultTransitionDuration = | 12 static const base::TimeDelta kDefaultTransitionDuration = |
| 13 base::TimeDelta::FromMilliseconds(200); | 13 base::TimeDelta::FromMilliseconds(200); |
| 14 | 14 |
| 15 } // namespace; | 15 } // namespace; |
| 16 | 16 |
| 17 namespace ui { | 17 namespace ui { |
| 18 | 18 |
| (...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 65 animator_->set_preemption_strategy(strategy); | 65 animator_->set_preemption_strategy(strategy); |
| 66 } | 66 } |
| 67 | 67 |
| 68 LayerAnimator::PreemptionStrategy | 68 LayerAnimator::PreemptionStrategy |
| 69 ScopedLayerAnimationSettings::GetPreemptionStrategy() const { | 69 ScopedLayerAnimationSettings::GetPreemptionStrategy() const { |
| 70 return animator_->preemption_strategy(); | 70 return animator_->preemption_strategy(); |
| 71 } | 71 } |
| 72 | 72 |
| 73 } // namespace ui | 73 } // namespace ui |
| 74 | 74 |
| OLD | NEW |