chrome/android/java/src/org/chromium/chrome/browser/toolbar/CustomTabToolbar.java - Issue 2838773002: Move offline related functions from Tab to OfflinePageUtils

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/CustomTabToolbar.java

Issue 2838773002: Move offline related functions from Tab to OfflinePageUtils (Closed)

Patch Set: Fix tests Created 3 years, 8 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/ToolbarModelImpl.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/CustomTabToolbar.java

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

index 0e9393dfaf3ae718f3cbd467f968e9fb13ca45d6..c5bae3470059d1b993a87a0978b4a61c2285b21a 100644

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

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

@@ -41,6 +41,7 @@ import org.chromium.chrome.browser.dom_distiller.DomDistillerServiceFactory;

import org.chromium.chrome.browser.dom_distiller.DomDistillerTabUtils;

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

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

+import org.chromium.chrome.browser.offlinepages.OfflinePageUtils;

import org.chromium.chrome.browser.omnibox.LocationBar;

import org.chromium.chrome.browser.omnibox.LocationBarLayout;

import org.chromium.chrome.browser.omnibox.UrlBar;

@@ -467,7 +468,8 @@ public class CustomTabToolbar extends ToolbarLayout implements LocationBar,

mSecurityIconType = securityLevel;

boolean isSmallDevice = !DeviceFormFactor.isTablet(getContext());

- boolean isOfflinePage = getCurrentTab() != null && getCurrentTab().isOfflinePage();

+ boolean isOfflinePage =

+ getCurrentTab() != null && OfflinePageUtils.isOfflinePage(getCurrentTab());

int id = LocationBarLayout.getSecurityIconResource(

securityLevel, isSmallDevice, isOfflinePage);