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

Side by Side Diff: ui/views/animation/bounds_animator.h

Issue 1162943002: Replace more ObserverList with base::ObserverList. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@observer
Patch Set: Created 5 years, 6 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/snapshot/screenshot_grabber.h ('k') | ui/views/controls/menu/native_menu_win.h » ('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_VIEWS_ANIMATION_BOUNDS_ANIMATOR_H_ 5 #ifndef UI_VIEWS_ANIMATION_BOUNDS_ANIMATOR_H_
6 #define UI_VIEWS_ANIMATION_BOUNDS_ANIMATOR_H_ 6 #define UI_VIEWS_ANIMATION_BOUNDS_ANIMATOR_H_
7 7
8 #include <map> 8 #include <map>
9 9
10 #include "base/compiler_specific.h" 10 #include "base/compiler_specific.h"
(...skipping 138 matching lines...) Expand 10 before | Expand all | Expand 10 after
149 void AnimationCanceled(const gfx::Animation* animation) override; 149 void AnimationCanceled(const gfx::Animation* animation) override;
150 150
151 // gfx::AnimationContainerObserver overrides. 151 // gfx::AnimationContainerObserver overrides.
152 void AnimationContainerProgressed( 152 void AnimationContainerProgressed(
153 gfx::AnimationContainer* container) override; 153 gfx::AnimationContainer* container) override;
154 void AnimationContainerEmpty(gfx::AnimationContainer* container) override; 154 void AnimationContainerEmpty(gfx::AnimationContainer* container) override;
155 155
156 // Parent of all views being animated. 156 // Parent of all views being animated.
157 View* parent_; 157 View* parent_;
158 158
159 ObserverList<BoundsAnimatorObserver> observers_; 159 base::ObserverList<BoundsAnimatorObserver> observers_;
160 160
161 // All animations we create up with the same container. 161 // All animations we create up with the same container.
162 scoped_refptr<gfx::AnimationContainer> container_; 162 scoped_refptr<gfx::AnimationContainer> container_;
163 163
164 // Maps from view being animated to info about the view. 164 // Maps from view being animated to info about the view.
165 ViewToDataMap data_; 165 ViewToDataMap data_;
166 166
167 // Maps from animation to view. 167 // Maps from animation to view.
168 AnimationToViewMap animation_to_view_; 168 AnimationToViewMap animation_to_view_;
169 169
170 // As the animations we create update (AnimationProgressed is invoked) this 170 // As the animations we create update (AnimationProgressed is invoked) this
171 // is updated. When all the animations have completed for a given tick of 171 // is updated. When all the animations have completed for a given tick of
172 // the timer (AnimationContainerProgressed is invoked) the parent_ is asked 172 // the timer (AnimationContainerProgressed is invoked) the parent_ is asked
173 // to repaint these bounds. 173 // to repaint these bounds.
174 gfx::Rect repaint_bounds_; 174 gfx::Rect repaint_bounds_;
175 175
176 int animation_duration_ms_; 176 int animation_duration_ms_;
177 177
178 gfx::Tween::Type tween_type_; 178 gfx::Tween::Type tween_type_;
179 179
180 DISALLOW_COPY_AND_ASSIGN(BoundsAnimator); 180 DISALLOW_COPY_AND_ASSIGN(BoundsAnimator);
181 }; 181 };
182 182
183 } // namespace views 183 } // namespace views
184 184
185 #endif // UI_VIEWS_ANIMATION_BOUNDS_ANIMATOR_H_ 185 #endif // UI_VIEWS_ANIMATION_BOUNDS_ANIMATOR_H_
OLDNEW
« no previous file with comments | « ui/snapshot/screenshot_grabber.h ('k') | ui/views/controls/menu/native_menu_win.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698