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

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

Issue 2964183002: Fixes stuck navigation when opening PWA in-scope page in CCT. (Closed)
Patch Set: Merge Created 3 years, 5 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/javatests/src/org/chromium/chrome/browser/webapps/WebappNavigationTest.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/CustomTabActivity.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabActivity.java
index 709dcc617c668c231b1c3988d9f28a5fe4eea249..7d83ded5ab22840ba5e4e31078dfecf7ecf2b1f7 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabActivity.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabActivity.java
@@ -537,7 +537,7 @@ public class CustomTabActivity extends ChromeActivity {
}
DataUseTabUIManager.onCustomTabInitialNavigation(mMainTab, packageName, url);
- if (!mHasCreatedTabEarly && !successfulStateRestore) {
+ if (!mHasCreatedTabEarly && !successfulStateRestore && !mMainTab.isLoading()) {
loadUrlInTab(mMainTab, new LoadUrlParams(url),
IntentHandler.getTimestampFromIntent(getIntent()));
}
@@ -611,6 +611,7 @@ public class CustomTabActivity extends ChromeActivity {
webContents = takeAsyncWebContents();
if (webContents != null) {
webContentsStateOnLaunch = WEBCONTENTS_STATE_TRANSFERRED_WEBCONTENTS;
+ webContents.resumeLoadingCreatedWebContents();
} else {
webContents = WarmupManager.getInstance().takeSpareWebContents(false, false);
if (webContents != null) {
« no previous file with comments | « no previous file | chrome/android/javatests/src/org/chromium/chrome/browser/webapps/WebappNavigationTest.java » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698