chrome/android/java/src/org/chromium/chrome/browser/download/ChromeDownloadDelegate.java - Issue 2235533002: Revert "Changed NavigationController access to through tab in Java code"

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/download/ChromeDownloadDelegate.java

Issue 2235533002: Revert "Changed NavigationController access to through tab in Java code" (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 4 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 | « chrome/android/java/src/org/chromium/chrome/browser/SwipeRefreshHandler.java ('k') | chrome/android/java/src/org/chromium/chrome/browser/metrics/UmaSessionStats.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/download/ChromeDownloadDelegate.java

diff --git a/chrome/android/java/src/org/chromium/chrome/browser/download/ChromeDownloadDelegate.java b/chrome/android/java/src/org/chromium/chrome/browser/download/ChromeDownloadDelegate.java

index 2a4998b170ff666e41621ed4427d4ff4df819aa9..fea2e2e26e0886ab8496472cab324f1bae3bdca1 100644

--- a/chrome/android/java/src/org/chromium/chrome/browser/download/ChromeDownloadDelegate.java

+++ b/chrome/android/java/src/org/chromium/chrome/browser/download/ChromeDownloadDelegate.java

@@ -29,7 +29,6 @@ import org.chromium.chrome.R;

import org.chromium.chrome.browser.ChromeActivity;

import org.chromium.chrome.browser.infobar.InfoBarIdentifier;

import org.chromium.chrome.browser.infobar.SimpleConfirmInfoBarBuilder;

-import org.chromium.chrome.browser.navigation.NavigationHandler;

import org.chromium.chrome.browser.tab.EmptyTabObserver;

import org.chromium.chrome.browser.tab.Tab;

import org.chromium.chrome.browser.tabmodel.TabModelSelector;

@@ -584,9 +583,9 @@ public class ChromeDownloadDelegate {

// We do not want caller to dismiss infobar.

return true;

}

- NavigationHandler navigationHandler = mTab.getNavigationHandler();

- boolean isInitialNavigation =

- navigationHandler == null || navigationHandler.isInitialNavigation();

+ WebContents contents = mTab.getWebContents();

+ boolean isInitialNavigation = contents == null

+ || contents.getNavigationController().isInitialNavigation();

if (isInitialNavigation) {

// Tab is created just for download, close it.

Activity activity = mTab.getWindowAndroid().getActivity().get();