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 979 matching lines @@
         PrintingController printingController = getChromeApplication().getPrintingController();
         if (printingController != null && !currentTab.isNativePage() && !printingController.isBusy()
                 && PrefServiceBridge.getInstance().isPrintingEnabled()) {
             PrintShareActivity.enablePrintShareOption(this);
         }
 
         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.
-                        String url = currentTab.getOriginalUrl();
                         RecordHistogram.recordBooleanHistogram(
-                                "OfflinePages.SharedPageWasOffline", url != null);
-
-                        // If there is no entry in the offline pages DB for this tab, use the tab's
-                        // URL directly.
-                        if (url == null) url = currentTab.getUrl();
+                                "OfflinePages.SharedPageWasOffline", currentTab.isOfflinePage());
 
                         ShareHelper.share(
-                                shareDirectly, mainActivity, currentTab.getTitle(), url, bitmap);
+                                shareDirectly, mainActivity, currentTab.getTitle(),
+                                currentTab.getUrl(), bitmap);
                         if (shareDirectly) {
                             RecordUserAction.record("MobileMenuDirectShare");
                         } else {
                             RecordUserAction.record("MobileMenuShare");
                         }
                     }
                 };
         if (isIncognito || currentTab.getWebContents() == null) {
             callback.onFinishGetBitmap(null, ReadbackResponse.SURFACE_UNAVAILABLE);
         } else {
@@ skipping 749 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);
         }
     }
 }