Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2881)

Unified Diff: chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTab.java

Issue 1308563006: Fix window.open crashes on custom tabs (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | chrome/android/java/src/org/chromium/chrome/browser/tab/ChromeTab.java » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTab.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTab.java b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTab.java
index 9f65073264402861c006d753fbfa33816cf76648..c577a34d27c3ef149f0c99d0cb327ca479023140 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTab.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTab.java
@@ -7,6 +7,7 @@ package org.chromium.chrome.browser.customtabs;
import android.content.Context;
import android.content.Intent;
import android.content.pm.ResolveInfo;
+import android.graphics.Rect;
import android.os.IBinder;
import android.os.SystemClock;
import android.os.TransactionTooLargeException;
@@ -342,4 +343,34 @@ public class CustomTab extends ChromeTab {
}
}
+ @Override
+ protected TabChromeWebContentsDelegateAndroid createWebContentsDelegate() {
+ return new TabChromeWebContentsDelegateAndroidImpl() {
+ private String mTargetUrl;
+
+ @Override
+ public boolean shouldResumeRequestsForCreatedWindow() {
+ return true;
+ }
+
+ @Override
+ public void webContentsCreated(WebContents sourceWebContents, long openerRenderFrameId,
+ String frameName, String targetUrl, WebContents newWebContents) {
+ super.webContentsCreated(
+ sourceWebContents, openerRenderFrameId, frameName, targetUrl,
+ newWebContents);
+ mTargetUrl = targetUrl;
+ }
+
+ @Override
+ public boolean addNewContents(WebContents sourceWebContents, WebContents webContents,
+ int disposition, Rect initialPosition, boolean userGesture) {
+ assert mTargetUrl != null;
+ loadUrlAndTrackFromTimestamp(
+ new LoadUrlParams(mTargetUrl), SystemClock.elapsedRealtime());
+ mTargetUrl = null;
+ return false;
+ }
+ };
+ }
}
« no previous file with comments | « no previous file | chrome/android/java/src/org/chromium/chrome/browser/tab/ChromeTab.java » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698