Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3083)

Unified Diff: chrome/android/java/src/org/chromium/chrome/browser/omnibox/LocationBarLayout.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
Index: chrome/android/java/src/org/chromium/chrome/browser/omnibox/LocationBarLayout.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/omnibox/LocationBarLayout.java b/chrome/android/java/src/org/chromium/chrome/browser/omnibox/LocationBarLayout.java
index 8ef70af240940bf7390d3c5033cf04a5ad35d1da..a949e84fed07e6f81287594c5e73864c8868b80a 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/omnibox/LocationBarLayout.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/omnibox/LocationBarLayout.java
@@ -60,6 +60,7 @@ import org.chromium.chrome.browser.ntp.NativePageFactory;
import org.chromium.chrome.browser.ntp.NewTabPage;
import org.chromium.chrome.browser.ntp.NewTabPage.FakeboxDelegate;
import org.chromium.chrome.browser.ntp.NewTabPageUma;
+import org.chromium.chrome.browser.offlinepages.OfflinePageUtils;
import org.chromium.chrome.browser.omnibox.AutocompleteController.OnSuggestionsReceivedListener;
import org.chromium.chrome.browser.omnibox.OmniboxResultsAdapter.OmniboxResultItem;
import org.chromium.chrome.browser.omnibox.OmniboxResultsAdapter.OmniboxSuggestionDelegate;
@@ -895,7 +896,8 @@ public class LocationBarLayout extends FrameLayout
}
@LocationBarButtonType private int getLocationBarButtonToShow() {
- boolean isOffline = getCurrentTab() != null && getCurrentTab().isOfflinePage();
+ boolean isOffline =
+ getCurrentTab() != null && OfflinePageUtils.isOfflinePage(getCurrentTab());
boolean isTablet = DeviceFormFactor.isTablet(getContext());
// The navigation icon type is only applicable on tablets. While smaller form factors do
@@ -1342,7 +1344,8 @@ public class LocationBarLayout extends FrameLayout
@Override
public void updateSecurityIcon(int securityLevel) {
boolean isSmallDevice = !DeviceFormFactor.isTablet(getContext());
- boolean isOfflinePage = getCurrentTab() != null && getCurrentTab().isOfflinePage();
+ boolean isOfflinePage =
+ getCurrentTab() != null && OfflinePageUtils.isOfflinePage(getCurrentTab());
int id = getSecurityIconResource(securityLevel, isSmallDevice, isOfflinePage);
if (id == 0) {
mSecurityButton.setImageDrawable(null);
@@ -1432,7 +1435,7 @@ public class LocationBarLayout extends FrameLayout
// Because is offline page is cleared a bit slower, we also ensure that connection security
// level is NONE or HTTP_SHOW_WARNING (http://crbug.com/671453).
boolean verboseStatusVisible = !mUrlHasFocus && getCurrentTab() != null
- && getCurrentTab().isOfflinePage()
+ && OfflinePageUtils.isOfflinePage(getCurrentTab())
&& (getSecurityLevel() == ConnectionSecurityLevel.NONE
|| getSecurityLevel() == ConnectionSecurityLevel.HTTP_SHOW_WARNING);

Powered by Google App Engine
This is Rietveld 408576698