Chromium Code Reviews| Index: content/browser/android/overscroll_glow.h |
| diff --git a/content/browser/android/overscroll_glow.h b/content/browser/android/overscroll_glow.h |
| index 0a555d41b7af8ac39c87889b4d36099bca796680..04280697695519c345b0d597d31fea336dfa89ba 100644 |
| --- a/content/browser/android/overscroll_glow.h |
| +++ b/content/browser/android/overscroll_glow.h |
| @@ -14,8 +14,8 @@ |
| class SkBitmap; |
| -namespace cc { |
| -class Layer; |
| +namespace ui { |
| +class SystemUIResourceManager; |
| } |
| namespace content { |
| @@ -26,11 +26,11 @@ namespace content { |
| */ |
| class OverscrollGlow { |
| public: |
| - // Create a new effect. If |enabled| is false, the effect will remain |
| - // deactivated until explicitly enabled. |
| - // Note: No resources will be allocated until the effect is both |
| - // enabled and an overscroll event has occurred. |
| - static scoped_ptr<OverscrollGlow> Create(bool enabled); |
| + // Create a new effect. |resource_manager| provides the resource for the |
| + // effect. |resource_manager| must outlive the effect. If |enabled| is false, |
| + // the effect will remain deactivated until explicitly enabled. |
|
jdduke (slow)
2014/07/23 18:17:45
You'll want to update the comment (specifically ab
powei
2014/07/23 21:56:08
Done.
|
| + static scoped_ptr<OverscrollGlow> Create( |
| + ui::SystemUIResourceManager* resource_manager); |
|
jdduke (slow)
2014/07/23 18:17:44
It looks like the factory method doesn't really se
powei
2014/07/23 21:56:08
Acknowledged.
|
| ~OverscrollGlow(); |
| @@ -70,7 +70,7 @@ class OverscrollGlow { |
| private: |
| enum Axis { AXIS_X, AXIS_Y }; |
| - OverscrollGlow(bool enabled); |
| + OverscrollGlow(ui::SystemUIResourceManager* resource_manager); |
|
jdduke (slow)
2014/07/23 18:17:45
Explicit.
powei
2014/07/23 21:56:08
Done.
|
| // Returns whether the effect is initialized. |
| bool InitializeIfNecessary(); |
| @@ -94,6 +94,7 @@ class OverscrollGlow { |
| bool initialized_; |
| scoped_refptr<cc::Layer> root_layer_; |
| + ui::SystemUIResourceManager* resource_manager_; |
| DISALLOW_COPY_AND_ASSIGN(OverscrollGlow); |
| }; |