Serve offline page for online URL on disconnected or bad networks

chrome/android/java/src/org/chromium/chrome/browser/omnibox/LocationBarLayout.java

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 package org.chromium.chrome.browser.omnibox;
 
 import static org.chromium.chrome.browser.toolbar.ToolbarPhone.URL_FOCUS_CHANGE_ANIMATION_DURATION_MS;
 
 import android.Manifest;
 import android.animation.Animator;
@@ skipping 884 matching lines @@
     @Override
     public void revertChanges() {
         if (!mUrlHasFocus) {
             setUrlToPageUrl();
         } else {
             Tab tab = mToolbarDataProvider.getTab();
             if (NativePageFactory.isNativePageUrl(tab.getUrl(), tab.isIncognito())) {
                 mUrlBar.setUrl("", null);
             } else {
                 mUrlBar.setUrl(
-                        mToolbarDataProvider.getText(), getOnlineUrlFromTab());
+                        mToolbarDataProvider.getText(), getCurrentTabUrl());
             }
         }
     }
 
     @Override
     public long getFirstUrlBarFocusTime() {
         return mUrlBar.getFirstFocusTime();
     }
 
     /**
@@ skipping 1101 matching lines @@
 
     /**
      * Sets the displayed URL to be the URL of the page currently showing.
      *
      * <p>The URL is converted to the most user friendly format (removing HTTP:// for example).
      *
      * <p>If the current tab is null, the URL text will be cleared.
      */
     @Override
     public void setUrlToPageUrl() {
-        String url = getOnlineUrlFromTab();
+        String url = getCurrentTabUrl();
 
         // If the URL is currently focused, do not replace the text they have entered with the URL.
         // Once they stop editing the URL, the current tab's URL will automatically be filled in.
         if (mUrlBar.hasFocus()) {
             if (mUrlFocusedWithoutAnimations && !NewTabPage.isNTPUrl(url)) {
                 // If we did not run the focus animations, then the user has not typed any text.
                 // So, clear the focus and accept whatever URL the page is currently attempting to
                 // display.
                 setUrlBarFocus(false);
             } else {
@@ skipping 19 matching lines @@
             return;
         }
 
         if (setUrlBarText(url, mToolbarDataProvider.getText())) {
             mUrlBar.deEmphasizeUrl();
             emphasizeUrl();
         }
         updateCustomSelectionActionModeCallback();
     }
 
-    /**
-     * Gets the URL of the web page in the tab. When displaying offline page it gets the URL of the
-     * original page.
-     */
-    private String getOnlineUrlFromTab() {
+    /** Gets the URL of the web page in the tab. */
+    private String getCurrentTabUrl() {
         Tab currentTab = getCurrentTab();
         if (currentTab == null) return "";
-        if (currentTab.isOfflinePage()) {
-            return currentTab.getOriginalUrl().trim();
-        }
         return currentTab.getUrl().trim();
     }
 
     /**
      * Changes the text on the url bar
      * @param originalText The original text (URL or search terms) for copy/cut.
      * @param displayText The text (URL or search terms) for user display.
      * @return Whether the URL was changed as a result of this call.
      */
     private boolean setUrlBarText(String originalText, String displayText) {
         mUrlBar.setIgnoreTextChangesForAutocomplete(true);
         boolean urlChanged = mUrlBar.setUrl(originalText, displayText);
         mUrlBar.setIgnoreTextChangesForAutocomplete(false);
         return urlChanged;
     }
 
     private void loadUrlFromOmniboxMatch(String url, int transition, int matchPosition, int type) {
         // loadUrl modifies AutocompleteController's state clearing the native
         // AutocompleteResults needed by onSuggestionsSelected. Therefore,
         // loadUrl should should be invoked last.
         Tab currentTab = getCurrentTab();
-        String currentPageUrl = currentTab != null ? currentTab.getUrl() : "";
+        String currentPageUrl = getCurrentTabUrl();
         WebContents webContents = currentTab != null ? currentTab.getWebContents() : null;
         long elapsedTimeSinceModified = mNewOmniboxEditSessionTimestamp > 0
                 ? (SystemClock.elapsedRealtime() - mNewOmniboxEditSessionTimestamp) : -1;
         mAutocomplete.onSuggestionSelected(matchPosition, type, currentPageUrl,
                 mUrlFocusedFromFakebox, elapsedTimeSinceModified, mUrlBar.getAutocompleteLength(),
                 webContents);
         loadUrl(url, transition);
     }
 
     private void loadUrl(String url, int transition) {
@@ skipping 341 matching lines @@
     public View getContainerView() {
         return this;
     }
 
     @Override
     public void setTitleToPageTitle() { }
 
     @Override
     public void setShowTitle(boolean showTitle) { }
 }