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

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

Issue 1868363002: Replace scoped_ptr with std::unique_ptr in //ui (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@scopedptrcc
Patch Set: scopedptrui: rebase-make_scoped_ptr Created 4 years, 8 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
« no previous file with comments | « ui/compositor/paint_recorder.h ('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_COMPOSITOR_SCOPED_LAYER_ANIMATION_SETTINGS_H_ 5 #ifndef UI_COMPOSITOR_SCOPED_LAYER_ANIMATION_SETTINGS_H_
6 #define UI_COMPOSITOR_SCOPED_LAYER_ANIMATION_SETTINGS_H_ 6 #define UI_COMPOSITOR_SCOPED_LAYER_ANIMATION_SETTINGS_H_
7 7
8 #include <set> 8 #include <set>
9 9
10 #include "base/macros.h" 10 #include "base/macros.h"
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
53 // the layer associated with animator_ before animating. 53 // the layer associated with animator_ before animating.
54 void AddInverselyAnimatedLayer(Layer* inverse_layer); 54 void AddInverselyAnimatedLayer(Layer* inverse_layer);
55 55
56 private: 56 private:
57 scoped_refptr<LayerAnimator> animator_; 57 scoped_refptr<LayerAnimator> animator_;
58 bool old_is_transition_duration_locked_; 58 bool old_is_transition_duration_locked_;
59 base::TimeDelta old_transition_duration_; 59 base::TimeDelta old_transition_duration_;
60 gfx::Tween::Type old_tween_type_; 60 gfx::Tween::Type old_tween_type_;
61 LayerAnimator::PreemptionStrategy old_preemption_strategy_; 61 LayerAnimator::PreemptionStrategy old_preemption_strategy_;
62 std::set<ImplicitAnimationObserver*> observers_; 62 std::set<ImplicitAnimationObserver*> observers_;
63 scoped_ptr<InvertingObserver> inverse_observer_; 63 std::unique_ptr<InvertingObserver> inverse_observer_;
64 64
65 DISALLOW_COPY_AND_ASSIGN(ScopedLayerAnimationSettings); 65 DISALLOW_COPY_AND_ASSIGN(ScopedLayerAnimationSettings);
66 }; 66 };
67 67
68 } // namespace ui 68 } // namespace ui
69 69
70 #endif // UI_COMPOSITOR_SCOPED_LAYER_ANIMATION_SETTINGS_H_ 70 #endif // UI_COMPOSITOR_SCOPED_LAYER_ANIMATION_SETTINGS_H_
OLDNEW
« no previous file with comments | « ui/compositor/paint_recorder.h ('k') | ui/compositor/scoped_layer_animation_settings.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698