| Index: chrome/android/java/src/org/chromium/chrome/browser/prerender/ExternalPrerenderHandler.java
|
| diff --git a/chrome/android/java/src/org/chromium/chrome/browser/prerender/ExternalPrerenderHandler.java b/chrome/android/java/src/org/chromium/chrome/browser/prerender/ExternalPrerenderHandler.java
|
| index 00665868353f82f661541644214698fe52f37307..fa94115cd6a15303d3a0fa73696ab0caaea5195d 100644
|
| --- a/chrome/android/java/src/org/chromium/chrome/browser/prerender/ExternalPrerenderHandler.java
|
| +++ b/chrome/android/java/src/org/chromium/chrome/browser/prerender/ExternalPrerenderHandler.java
|
| @@ -33,13 +33,15 @@ public class ExternalPrerenderHandler {
|
| * @param referrer The referrer for the prerender request.
|
| * @param width The width for the content view (render widget host view) for the prerender.
|
| * @param height The height for the content view (render widget host view) for the prerender.
|
| + * @param prerenderOnCellular Whether the prerender should happen if the device has a cellular
|
| + * connection.
|
| * @return The {@link WebContents} that is linked to this prerender. {@code null} if
|
| * unsuccessful.
|
| */
|
| public WebContents addPrerender(Profile profile, String url, String referrer, int width,
|
| - int height) {
|
| + int height, boolean prerenderOnCellular) {
|
| WebContents webContents = WebContentsFactory.createWebContents(false, false);
|
| - if (addPrerender(profile, webContents, url, referrer, width, height)) {
|
| + if (addPrerender(profile, webContents, url, referrer, width, height, prerenderOnCellular)) {
|
| return webContents;
|
| }
|
| if (webContents != null) webContents.destroy();
|
| @@ -56,12 +58,14 @@ public class ExternalPrerenderHandler {
|
| * @param referrer The referrer for the prerender request.
|
| * @param width The width for the content view (render widget host view) for the prerender.
|
| * @param height The height for the content view (render widget host view) for the prerender.
|
| + * @param prerenderOnCellular Whether the prerender should happen if the device has a cellular
|
| + * connection.
|
| * @return Whether the prerender was successful.
|
| */
|
| public boolean addPrerender(Profile profile, WebContents webContents, String url,
|
| - String referrer, int width, int height) {
|
| + String referrer, int width, int height, boolean prerenderOnCellular) {
|
| return nativeAddPrerender(mNativeExternalPrerenderHandler, profile, webContents,
|
| - url, referrer, width, height);
|
| + url, referrer, width, height, prerenderOnCellular);
|
| }
|
|
|
| /**
|
| @@ -101,7 +105,8 @@ public class ExternalPrerenderHandler {
|
| private static native long nativeInit();
|
| private static native boolean nativeAddPrerender(
|
| long nativeExternalPrerenderHandlerAndroid, Profile profile,
|
| - WebContents webContents, String url, String referrer, int width, int height);
|
| + WebContents webContents, String url, String referrer,
|
| + int width, int height, boolean prerenderOnCellular);
|
| private static native boolean nativeHasPrerenderedUrl(
|
| Profile profile, String url, WebContents webContents);
|
| private static native boolean nativeHasPrerenderedAndFinishedLoadingUrl(
|
|
|