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

Unified Diff: chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java

Issue 2081153005: [Offline Page] Offline page sharing implementation (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Grammar fix Created 4 years, 4 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 | « no previous file | chrome/android/java/src/org/chromium/chrome/browser/DeferredStartupHandler.java » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java
index 4218cb93449848983c5275b0fe65a4a2e22a6a4d..6ae8c1ee913bc9da9eecbe66075f31fe61e647bd 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java
@@ -84,6 +84,8 @@ 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;
@@ -995,26 +997,35 @@ public abstract class ChromeActivity extends AsyncInitializationActivity
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();
-
- ShareHelper.share(shareDirectly, true, mainActivity, currentTab.getTitle(),
- null, url, bitmap, null);
- if (shareDirectly) {
- RecordUserAction.record("MobileMenuDirectShare");
- } else {
- RecordUserAction.record("MobileMenuShare");
- }
+ @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 url = currentTab.getOriginalUrl();
+ RecordHistogram.recordBooleanHistogram(
+ "OfflinePages.SharedPageWasOffline", offlinePage != null);
+ boolean canShareOfflinePage =
+ (offlinePage != null && OfflinePageBridge.isPageSharingEnabled());
+
+ if (canShareOfflinePage) {
+ // Share the offline page instead of the URL.
+ OfflinePageUtils.shareOfflinePage(
+ shareDirectly, true, mainActivity, null, url, bitmap, null, currentTab);
+ } else {
+ // 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();
+
+ ShareHelper.share(shareDirectly, true, mainActivity, currentTab.getTitle(),
+ null, url, null, bitmap, null);
+ if (shareDirectly) {
+ RecordUserAction.record("MobileMenuDirectShare");
+ } else {
+ RecordUserAction.record("MobileMenuShare");
}
- };
+ }
+ }
+ };
if (isIncognito || currentTab.getWebContents() == null) {
callback.onFinishGetBitmap(null, ReadbackResponse.SURFACE_UNAVAILABLE);
} else {
« no previous file with comments | « no previous file | chrome/android/java/src/org/chromium/chrome/browser/DeferredStartupHandler.java » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698