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

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

Issue 10808072: ui: No need to typedef testing::Test in unittests. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: typos Created 8 years, 4 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/compositor.cc ('k') | ui/gfx/canvas_skia.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 #include "ui/compositor/scoped_layer_animation_settings.h" 5 #include "ui/compositor/scoped_layer_animation_settings.h"
6 6
7 #include "ui/compositor/layer_animation_observer.h" 7 #include "ui/compositor/layer_animation_observer.h"
8 #include "ui/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
19 ScopedLayerAnimationSettings::ScopedLayerAnimationSettings( 19 ScopedLayerAnimationSettings::ScopedLayerAnimationSettings(
20 LayerAnimator* animator) 20 LayerAnimator* animator)
21 : animator_(animator), 21 : animator_(animator),
22 old_transition_duration_(animator->transition_duration_), 22 old_transition_duration_(animator->transition_duration_),
23 old_tween_type_(animator->tween_type()), 23 old_tween_type_(animator->tween_type()),
24 old_preemption_strategy_(animator->preemption_strategy()) { 24 old_preemption_strategy_(animator->preemption_strategy()) {
25 SetTransitionDuration(kDefaultTransitionDuration); 25 SetTransitionDuration(kDefaultTransitionDuration);
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
64 LayerAnimator::PreemptionStrategy strategy) { 64 LayerAnimator::PreemptionStrategy strategy) {
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
OLDNEW
« no previous file with comments | « ui/compositor/compositor.cc ('k') | ui/gfx/canvas_skia.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698