android: Use UIResource for overscroll glow

content/browser/android/overscroll_glow.h

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..6154a64feed9c3e26dc4ecb5b0d961e949aa4f7b 100644
--- a/content/browser/android/overscroll_glow.h
+++ b/content/browser/android/overscroll_glow.h
@@ -18,19 +18,30 @@ namespace cc {
 class Layer;
 }
 
+namespace ui {
+class SystemUIResourceManager;
+}
+
 namespace content {
 
+// A wrapper class over the cc::Layer.
+class OverscrollGlowLayerWrapper {

[jdduke (slow), 2014/07/12 01:01:09]

Could we have EdgeEffect define this interface (in edge_effect.h)?
EdgeEffectLayerWrapper? I'd like to keep EdgeEffect from having an
OverscrollGlow dependency.

[powei, 2014/07/16 17:10:52]

Done.

+ public:
+  virtual scoped_refptr<cc::Layer> layer() = 0;

[jdduke (slow), 2014/07/12 01:01:09]

What about just returning a naked pointer?

[powei, 2014/07/16 17:10:51]

Done.

+  virtual ~OverscrollGlowLayerWrapper() {}
+};
+
 /* |OverscrollGlow| mirrors its Android counterpart, OverscrollGlow.java.
  * Conscious tradeoffs were made to align this as closely as possible with the
  * original Android Java version.
  */
 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. WindowAndroid provides the resource for the effect.

[jdduke (slow), 2014/07/12 01:01:09]

Hmm, did you mean to reference WindowAndroid instead of SystemUIResourceManager?
Maybe put a brief note that |resource_manager| must outlive the effect?

[powei, 2014/07/16 17:10:52]

Done.

+  // If |enabled| is false, the effect will remain deactivated until explicitly
+  // enabled.
+  static scoped_ptr<OverscrollGlow> Create(
+      ui::SystemUIResourceManager* resource_manager);
 
   ~OverscrollGlow();
 
@@ -70,7 +81,7 @@ class OverscrollGlow {
  private:
   enum Axis { AXIS_X, AXIS_Y };
 
-  OverscrollGlow(bool enabled);
+  OverscrollGlow(ui::SystemUIResourceManager* resource_manager);
 
   // Returns whether the effect is initialized.
   bool InitializeIfNecessary();
@@ -94,6 +105,7 @@ class OverscrollGlow {
   bool initialized_;
 
   scoped_refptr<cc::Layer> root_layer_;
+  ui::SystemUIResourceManager* resource_manager_;
 
   DISALLOW_COPY_AND_ASSIGN(OverscrollGlow);
 };