Merge java_staging/src into java/src.

chrome/android/java_staging/src/org/chromium/chrome/browser/ntp/BookmarksListView.java

Index: chrome/android/java_staging/src/org/chromium/chrome/browser/ntp/BookmarksListView.java
diff --git a/chrome/android/java_staging/src/org/chromium/chrome/browser/ntp/BookmarksListView.java b/chrome/android/java_staging/src/org/chromium/chrome/browser/ntp/BookmarksListView.java
deleted file mode 100644
index a8b0a4a5368cea8368e6991e88dad70c954c6100..0000000000000000000000000000000000000000
--- a/chrome/android/java_staging/src/org/chromium/chrome/browser/ntp/BookmarksListView.java
+++ /dev/null
@@ -1,48 +0,0 @@
-// Copyright 2015 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-package org.chromium.chrome.browser.ntp;
-
-import android.content.Context;
-import android.graphics.Canvas;
-import android.util.AttributeSet;
-import android.widget.ListView;
-
-import org.chromium.chrome.R;
-import org.chromium.chrome.browser.widget.FadingShadow;
-
-/**
- * The ListView that holds the bookmark items.
- */
-public class BookmarksListView extends ListView {
-
-    private static final int SHADOW_COLOR = 0x11000000;
-
-    private FadingShadow mFadingShadow;
-
-    public BookmarksListView(Context context, AttributeSet attrs) {
-        super(context, attrs);
-        mFadingShadow = new FadingShadow(SHADOW_COLOR);
-        setFadingEdgeLength(getResources().getDimensionPixelSize(R.dimen.ntp_shadow_height));
-        setDivider(null);
-        setDividerHeight(0);
-    }
-
-    @Override
-    protected void dispatchDraw(Canvas canvas) {
-        super.dispatchDraw(canvas);
-        setVerticalFadingEdgeEnabled(true);
-        float shadowStrength = getTopFadingEdgeStrength();
-        float shadowHeight = getVerticalFadingEdgeLength();
-        setVerticalFadingEdgeEnabled(false);
-        mFadingShadow.drawShadow(this, canvas, FadingShadow.POSITION_TOP, shadowHeight,
-                shadowStrength);
-    }
-
-    // Change the visibility of this method to public, so BookmarksPageView can call it.
-    @Override
-    public boolean awakenScrollBars() {
-        return super.awakenScrollBars();
-    }
-}