chrome/android/java/src/org/chromium/chrome/browser/metrics/UmaSessionStats.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/metrics/UmaSessionStats.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/download/ChromeDownloadDelegate.java ('k') | chrome/android/java/src/org/chromium/chrome/browser/navigation/NavigationHandler.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/metrics/UmaSessionStats.java

diff --git a/chrome/android/java/src/org/chromium/chrome/browser/metrics/UmaSessionStats.java b/chrome/android/java/src/org/chromium/chrome/browser/metrics/UmaSessionStats.java

index 2ebed96d34158787b336c2510d21812985576498..7aaaff8b232e5d2bde0f2e777384bacd122d1203 100644

--- a/chrome/android/java/src/org/chromium/chrome/browser/metrics/UmaSessionStats.java

+++ b/chrome/android/java/src/org/chromium/chrome/browser/metrics/UmaSessionStats.java

@@ -18,6 +18,7 @@ import org.chromium.chrome.browser.tabmodel.TabModel;

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

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

import org.chromium.components.variations.VariationsAssociatedData;

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

import org.chromium.net.NetworkChangeNotifier;

/**

@@ -52,8 +53,9 @@ public class UmaSessionStats implements NetworkChangeNotifier.ConnectionTypeObse

}

private void recordPageLoadStats(Tab tab) {

- boolean isDesktopUserAgent = tab.getNavigationHandler() != null

- && tab.getNavigationHandler().getUseDesktopUserAgent();

+ WebContents webContents = tab.getWebContents();

+ boolean isDesktopUserAgent = webContents != null

+ && webContents.getNavigationController().getUseDesktopUserAgent();

nativeRecordPageLoaded(isDesktopUserAgent);

if (mKeyboardConnected) {

nativeRecordPageLoadedWithKeyboard();