| 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 #ifndef UI_VIEWS_ANIMATION_SCROLL_ANIMATOR_H_ | 5 #ifndef UI_VIEWS_ANIMATION_SCROLL_ANIMATOR_H_ |
| 6 #define UI_VIEWS_ANIMATION_SCROLL_ANIMATOR_H_ | 6 #define UI_VIEWS_ANIMATION_SCROLL_ANIMATOR_H_ |
| 7 | 7 |
| 8 #include "base/basictypes.h" | 8 #include "base/macros.h" |
| 9 #include "base/memory/scoped_ptr.h" | 9 #include "base/memory/scoped_ptr.h" |
| 10 #include "ui/gfx/animation/animation_delegate.h" | 10 #include "ui/gfx/animation/animation_delegate.h" |
| 11 #include "ui/views/views_export.h" | 11 #include "ui/views/views_export.h" |
| 12 | 12 |
| 13 namespace gfx { | 13 namespace gfx { |
| 14 class SlideAnimation; | 14 class SlideAnimation; |
| 15 } | 15 } |
| 16 | 16 |
| 17 namespace views { | 17 namespace views { |
| 18 | 18 |
| (...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 54 float acceleration_; | 54 float acceleration_; |
| 55 | 55 |
| 56 scoped_ptr<gfx::SlideAnimation> animation_; | 56 scoped_ptr<gfx::SlideAnimation> animation_; |
| 57 | 57 |
| 58 DISALLOW_COPY_AND_ASSIGN(ScrollAnimator); | 58 DISALLOW_COPY_AND_ASSIGN(ScrollAnimator); |
| 59 }; | 59 }; |
| 60 | 60 |
| 61 } // namespace views | 61 } // namespace views |
| 62 | 62 |
| 63 #endif // UI_VIEWS_ANIMATION_SCROLL_ANIMATOR_H_ | 63 #endif // UI_VIEWS_ANIMATION_SCROLL_ANIMATOR_H_ |
| OLD | NEW |