Serve offline page for online URL on disconnected or bad networks

chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.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;
 
 import android.annotation.SuppressLint;
 import android.annotation.TargetApi;
 import android.app.Activity;
 import android.app.SearchManager;
@@ skipping 71 matching lines @@
 import org.chromium.chrome.browser.infobar.InfoBarContainer;
 import org.chromium.chrome.browser.init.AsyncInitializationActivity;
 import org.chromium.chrome.browser.metrics.LaunchMetrics;
 import org.chromium.chrome.browser.metrics.StartupMetrics;
 import org.chromium.chrome.browser.metrics.UmaSessionStats;
 import org.chromium.chrome.browser.metrics.UmaUtils;
 import org.chromium.chrome.browser.multiwindow.MultiWindowUtils;
 import org.chromium.chrome.browser.nfc.BeamController;
 import org.chromium.chrome.browser.nfc.BeamProvider;
 import org.chromium.chrome.browser.offlinepages.OfflinePageBridge;
-import org.chromium.chrome.browser.offlinepages.OfflinePageItem;
 import org.chromium.chrome.browser.offlinepages.OfflinePageUtils;
 import org.chromium.chrome.browser.offlinepages.downloads.OfflinePageDownloadBridge;
 import org.chromium.chrome.browser.omaha.UpdateMenuItemHelper;
 import org.chromium.chrome.browser.pageinfo.WebsiteSettingsPopup;
 import org.chromium.chrome.browser.partnercustomizations.PartnerBrowserCustomizations;
 import org.chromium.chrome.browser.preferences.ChromePreferenceManager;
 import org.chromium.chrome.browser.preferences.PrefServiceBridge;
 import org.chromium.chrome.browser.preferences.PreferencesLauncher;
 import org.chromium.chrome.browser.printing.PrintShareActivity;
 import org.chromium.chrome.browser.printing.TabPrinter;
@@ skipping 915 matching lines @@
 
         triggerShare(currentTab, shareDirectly, isIncognito);
     }
 
     private void triggerShare(
             final Tab currentTab, final boolean shareDirectly, boolean isIncognito) {
         final Activity mainActivity = this;
         ContentBitmapCallback callback = new ContentBitmapCallback() {
             @Override
             public void onFinishGetBitmap(Bitmap bitmap, int response) {
-                // Check whether this page is an offline page, and use its online URL if so.
-                OfflinePageItem offlinePage = currentTab.getOfflinePage();
-                String onlineUrl = currentTab.getOriginalUrl();
+                boolean isOfflinePage = currentTab.isOfflinePage();
                 RecordHistogram.recordBooleanHistogram(
-                        "OfflinePages.SharedPageWasOffline", offlinePage != null);
+                        "OfflinePages.SharedPageWasOffline", isOfflinePage);
                 boolean canShareOfflinePage = OfflinePageBridge.isPageSharingEnabled();
 
                 if (canShareOfflinePage) {
                     // Share the offline page instead of the URL.
-                    boolean isOfflinePage = (offlinePage != null);
                     OfflinePageUtils.shareOfflinePage(shareDirectly, true, mainActivity, null,
-                            onlineUrl, bitmap, null, currentTab, isOfflinePage);
+                            currentTab.getUrl(), bitmap, null, currentTab, isOfflinePage);
                 } else {
                     ShareHelper.share(shareDirectly, true, mainActivity, currentTab.getTitle(),
-                            null, onlineUrl, null, bitmap, null);
+                            null, currentTab.getUrl(), null, bitmap, null);
                     if (shareDirectly) {
                         RecordUserAction.record("MobileMenuDirectShare");
                     } else {
                         RecordUserAction.record("MobileMenuShare");
                     }
                 }
             }
         };
         if (isIncognito || currentTab.getWebContents() == null) {
             callback.onFinishGetBitmap(null, ReadbackResponse.SURFACE_UNAVAILABLE);
@@ skipping 775 matching lines @@
                 "Android.MultiWindowMode.IsTabletScreenWidthBelow600",
                 mScreenWidthDp < DeviceFormFactor.MINIMUM_TABLET_WIDTH_DP);
 
         if (mScreenWidthDp < DeviceFormFactor.MINIMUM_TABLET_WIDTH_DP) {
             RecordHistogram.recordLinearCountHistogram(
                     "Android.MultiWindowMode.TabletScreenWidth", mScreenWidthDp, 1,
                     DeviceFormFactor.MINIMUM_TABLET_WIDTH_DP, 50);
         }
     }
 }