| Index: content/browser/android/content_view_core_impl.h
|
| diff --git a/content/browser/android/content_view_core_impl.h b/content/browser/android/content_view_core_impl.h
|
| index 72a7256e6392926b193fc73f311725e0523716e4..eb96bcade0371f1c96fea0f397d6a6bed58922b6 100644
|
| --- a/content/browser/android/content_view_core_impl.h
|
| +++ b/content/browser/android/content_view_core_impl.h
|
| @@ -29,6 +29,7 @@ class WindowAndroid;
|
| }
|
|
|
| namespace content {
|
| +class OverscrollGlow;
|
| class RenderWidgetHostViewAndroid;
|
| class SyncInputEventFilter;
|
|
|
| @@ -169,6 +170,10 @@ class ContentViewCoreImpl : public ContentViewCore,
|
|
|
| jint GetBackgroundColor(JNIEnv* env, jobject obj);
|
| void SetBackgroundColor(JNIEnv* env, jobject obj, jint color);
|
| + void SetOverscrollResources(JNIEnv* env,
|
| + jobject obj,
|
| + jobject jedge_bitmap,
|
| + jobject jglow_bitmap);
|
| void OnShow(JNIEnv* env, jobject obj);
|
| void OnHide(JNIEnv* env, jobject obj);
|
| void ClearSslPreferences(JNIEnv* env, jobject /* obj */);
|
| @@ -286,6 +291,9 @@ class ContentViewCoreImpl : public ContentViewCore,
|
| void RemoveLayer(scoped_refptr<cc::Layer> layer);
|
| void DidProduceRendererFrame();
|
|
|
| + const SkBitmap& get_overscroll_edge() const { return overscroll_edge_; }
|
| + const SkBitmap& get_overscroll_glow() const { return overscroll_glow_; }
|
| +
|
| private:
|
| class ContentViewUserData;
|
|
|
| @@ -353,6 +361,9 @@ class ContentViewCoreImpl : public ContentViewCore,
|
| // Optional browser-side input event filtering.
|
| scoped_ptr<SyncInputEventFilter> input_event_filter_;
|
|
|
| + SkBitmap overscroll_edge_;
|
| + SkBitmap overscroll_glow_;
|
| +
|
| DISALLOW_COPY_AND_ASSIGN(ContentViewCoreImpl);
|
| };
|
|
|
|
|