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

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

Issue 2202423004: [Offline Page]Enable share offline page from online tab (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@newBranchOnTryout
Patch Set: Use get best page instead 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
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 48cdb6cd77b829376a0e2cf3bedd47b2f03f8556..97b111c35e6b313620c96006398691b2d6291a27 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java
@@ -967,8 +967,7 @@ public abstract class ChromeActivity extends AsyncInitializationActivity
String url = currentTab.getOfflinePageOriginalUrl();
RecordHistogram.recordBooleanHistogram(
"OfflinePages.SharedPageWasOffline", url != null);
- boolean isOfflinePageSharingEnabled =
- (url != null && OfflinePageBridge.isPageSharingEnabled());
+ boolean isOfflinePageSharingEnabled = OfflinePageBridge.isPageSharingEnabled();
if (!isOfflinePageSharingEnabled) {
// If there is no entry in the offline pages DB for this tab, use the
@@ -986,9 +985,14 @@ public abstract class ChromeActivity extends AsyncInitializationActivity
// This is for experienmental feature Offline Page Sharing.
// If this page is an offline page, and the share the offline page
// instead of url.
+ boolean isOnOfflinePage = true;
fgorski 2016/08/08 17:59:22 boolean isOfflinePage = (url != null); if (!isOffl
Vivian 2016/08/08 21:40:36 Done.
+ if (url == null) {
+ url = currentTab.getUrl();
+ isOnOfflinePage = false;
+ }
Context mContext = getApplicationContext();
- OfflinePageUtils.shareOfflinePage(
- shareDirectly, mainActivity, url, bitmap, mContext, currentTab);
+ OfflinePageUtils.shareOfflinePage(shareDirectly, mainActivity, url, bitmap,
+ mContext, currentTab, isOnOfflinePage);
}
}
};

Powered by Google App Engine
This is Rietveld 408576698