OLD | NEW |
---|---|
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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 CONTENT_BROWSER_ANDROID_OVERSCROLL_CONTROLLER_ANDROID_H_ | 5 #ifndef CONTENT_BROWSER_ANDROID_OVERSCROLL_CONTROLLER_ANDROID_H_ |
6 #define CONTENT_BROWSER_ANDROID_OVERSCROLL_CONTROLLER_ANDROID_H_ | 6 #define CONTENT_BROWSER_ANDROID_OVERSCROLL_CONTROLLER_ANDROID_H_ |
7 | 7 |
8 #include "base/time/time.h" | 8 #include "base/time/time.h" |
9 #include "content/browser/android/overscroll_glow.h" | 9 #include "content/browser/android/overscroll_glow.h" |
10 #include "content/browser/android/overscroll_refresh.h" | 10 #include "content/browser/android/overscroll_refresh.h" |
(...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
73 bool IsStillRefreshing() const override; | 73 bool IsStillRefreshing() const override; |
74 | 74 |
75 void SetNeedsAnimate(); | 75 void SetNeedsAnimate(); |
76 | 76 |
77 ui::WindowAndroidCompositor* compositor_; | 77 ui::WindowAndroidCompositor* compositor_; |
78 const float dpi_scale_; | 78 const float dpi_scale_; |
79 | 79 |
80 bool enabled_; | 80 bool enabled_; |
81 | 81 |
82 // TODO(jdduke): Factor out a common API from the two overscroll effects. | 82 // TODO(jdduke): Factor out a common API from the two overscroll effects. |
83 OverscrollGlow glow_effect_; | 83 scoped_ptr<OverscrollGlow> glow_effect_; |
jdduke (slow)
2014/11/18 22:57:49
This is kind of unfortunate, but oh well.
| |
84 OverscrollRefresh refresh_effect_; | 84 scoped_ptr<OverscrollRefresh> refresh_effect_; |
85 bool triggered_refresh_active_; | 85 bool triggered_refresh_active_; |
86 | 86 |
87 DISALLOW_COPY_AND_ASSIGN(OverscrollControllerAndroid); | 87 DISALLOW_COPY_AND_ASSIGN(OverscrollControllerAndroid); |
88 }; | 88 }; |
89 | 89 |
90 } // namespace content | 90 } // namespace content |
91 | 91 |
92 #endif // CONTENT_BROWSER_ANDROID_OVERSCROLL_CONTROLLER_ANDROID_H_ | 92 #endif // CONTENT_BROWSER_ANDROID_OVERSCROLL_CONTROLLER_ANDROID_H_ |
OLD | NEW |