chrome/android/java/src/org/chromium/chrome/browser/tab/BackgroundContentViewHelper.java - Issue 1194383003: Add a flag showing whether the current request was ignored by a handler

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/android/java/src/org/chromium/chrome/browser/tab/BackgroundContentViewHelper.java

Issue 1194383003: Add a flag showing whether the current request was ignored by a handler (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Fix trybot failures (DidFailProvisionalLoad calls in unit tests) Created 5 years, 6 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 | « chrome/android/java/src/org/chromium/chrome/browser/Tab.java ('k') | chrome/android/java_staging/src/org/chromium/chrome/browser/tab/ChromeTab.java » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/android/java/src/org/chromium/chrome/browser/tab/BackgroundContentViewHelper.java

diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tab/BackgroundContentViewHelper.java b/chrome/android/java/src/org/chromium/chrome/browser/tab/BackgroundContentViewHelper.java

index 07f4ba7e83e8dc64a09e2990535b789449112f2e..9a7f0bd304a324cb348a0febb9d5597e7feab578 100644

--- a/chrome/android/java/src/org/chromium/chrome/browser/tab/BackgroundContentViewHelper.java

+++ b/chrome/android/java/src/org/chromium/chrome/browser/tab/BackgroundContentViewHelper.java

@@ -408,8 +408,8 @@ public class BackgroundContentViewHelper extends EmptyTabObserver {

}

@Override

- public void didFailLoad(boolean isProvisionalLoad,

- boolean isMainFrame, int errorCode, String description, String failingUrl) {

+ public void didFailLoad(boolean isProvisionalLoad, boolean isMainFrame, int errorCode,

+ String description, String failingUrl, boolean wasIgnoredByHandler) {

if (isMainFrame) {

RecordHistogram.recordEnumeratedHistogram(

"InstantSearchClicks.ReasonForSwap",

@@ -810,8 +810,8 @@ public class BackgroundContentViewHelper extends EmptyTabObserver {

mCurrentViewWebContentsObserver = new WebContentsObserver(mTab.getWebContents()) {

@Override

- public void didFailLoad(boolean isProvisionalLoad,

- boolean isMainFrame, int errorCode, String description, String failingUrl) {

+ public void didFailLoad(boolean isProvisionalLoad, boolean isMainFrame, int errorCode,

+ String description, String failingUrl, boolean wasIgnoredByHandler) {

if (isMainFrame && hasPendingBackgroundPage()) {

if (TextUtils.equals(mContentViewCore.getWebContents().getUrl(),

getOriginalUrlForPreviewUrl(failingUrl))) {