chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarManager.java - Issue 2087543002: 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/toolbar/ToolbarManager.java

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

Patch Set: Renamed interface to NavigationHandler Created 4 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/Tab.java ('k') | chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarTablet.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/toolbar/ToolbarManager.java

diff --git a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarManager.java b/chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarManager.java

index bb41b481944a616d00982eb6fce612e8429f5d0c..1eb2cbaa666e5e5942b6e6cbabacf64d0cfe043a 100644

--- a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarManager.java

+++ b/chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarManager.java

@@ -42,6 +42,7 @@ import org.chromium.chrome.browser.compositor.layouts.OverviewModeBehavior.Overv

import org.chromium.chrome.browser.compositor.layouts.SceneChangeObserver;

import org.chromium.chrome.browser.fullscreen.ChromeFullscreenManager;

import org.chromium.chrome.browser.fullscreen.FullscreenManager;

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

import org.chromium.chrome.browser.ntp.IncognitoNewTabPage;

import org.chromium.chrome.browser.ntp.NativePageFactory;

import org.chromium.chrome.browser.ntp.NewTabPage;

@@ -69,8 +70,6 @@ import org.chromium.chrome.browser.util.FeatureUtilities;

import org.chromium.chrome.browser.widget.findinpage.FindToolbarManager;

import org.chromium.chrome.browser.widget.findinpage.FindToolbarObserver;

import org.chromium.content_public.browser.LoadUrlParams;

-import org.chromium.content_public.browser.NavigationController;

-import org.chromium.content_public.browser.WebContents;

import org.chromium.ui.base.DeviceFormFactor;

import org.chromium.ui.base.PageTransition;

@@ -395,11 +394,9 @@ public class ToolbarManager implements ToolbarTabController, UrlFocusChangeListe

// But we want to update only when it's a new tab. So we check whether the current

// navigation entry is initial, meaning whether it has the same target URL as the

// initial URL of the tab.

- WebContents webContents = tab.getWebContents();

- if (webContents == null) return;

- NavigationController navigationController = webContents.getNavigationController();

- if (navigationController == null) return;

- if (navigationController.isInitialNavigation()) {

+ NavigationHandler navigationHandler = tab.getNavigationHandler();

+ if (navigationHandler == null) return;

+ if (navigationHandler.isInitialNavigation()) {

mLocationBar.setUrlToPageUrl();

}