| Index: chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPageScrollView.java
|
| diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPageScrollView.java b/chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPageScrollView.java
|
| index fe3e978c607cf2a8585f97f0aab46d3b144d9c08..608e2b7037d411e434f261e8f34d9d584120f422 100644
|
| --- a/chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPageScrollView.java
|
| +++ b/chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPageScrollView.java
|
| @@ -42,8 +42,6 @@ public class NewTabPageScrollView extends ScrollView {
|
| private GestureDetector mGestureDetector;
|
| private OnScrollListener mOnScrollListener;
|
|
|
| - private NewTabPageLayout mNewTabPageLayout;
|
| -
|
| private FadingShadow mFadingShadow;
|
|
|
| /**
|
| @@ -76,23 +74,6 @@ public class NewTabPageScrollView extends ScrollView {
|
| }
|
|
|
| @Override
|
| - protected void onFinishInflate() {
|
| - super.onFinishInflate();
|
| -
|
| - View child = getChildAt(0);
|
| - if (child instanceof NewTabPageLayout) mNewTabPageLayout = (NewTabPageLayout) child;
|
| - }
|
| -
|
| - @Override
|
| - protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
|
| - if (mNewTabPageLayout != null) {
|
| - mNewTabPageLayout.setParentScrollViewportHeight(
|
| - MeasureSpec.getSize(heightMeasureSpec));
|
| - }
|
| - super.onMeasure(widthMeasureSpec, heightMeasureSpec);
|
| - }
|
| -
|
| - @Override
|
| public boolean onInterceptTouchEvent(MotionEvent ev) {
|
| mGestureDetector.onTouchEvent(ev);
|
| return super.onInterceptTouchEvent(ev);
|
|
|