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

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

Issue 2184913005: Add calls to the server to request WebAPK updates. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: WebAPK no longer owns a ManifestUpgradeDetector and rebase on "worker thread" CL. 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/webapps/ManifestUpgradeDetector.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/webapps/ManifestUpgradeDetector.java b/chrome/android/java/src/org/chromium/chrome/browser/webapps/ManifestUpgradeDetector.java
index 5ac4b9d5f0987380001ce309a25499f6c15d60cc..3710ec0ef9c3ae294b6d39c69553fa7b748d7b70 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/webapps/ManifestUpgradeDetector.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/webapps/ManifestUpgradeDetector.java
@@ -19,6 +19,13 @@ import org.chromium.chrome.browser.tab.Tab;
*/
public class ManifestUpgradeDetector implements ManifestUpgradeDetectorFetcher.Callback {
/**
+ * Called when the process of checking Web Manifest update is complete.
+ */
+ public interface CheckIfUpgradeNeededCallback {
pkotwicz 2016/08/11 22:02:43 Nits: - Rename this class to Callback .You can get
Xi Han 2016/08/15 21:38:44 Done.
+ public void onCheckIfUpdateNeededFinished(boolean isUpgraded, WebappInfo newInfo);
pkotwicz 2016/08/11 22:02:43 Nit: "public" in interfaces is redundant. See http
Xi Han 2016/08/15 21:38:44 Done.
+ }
+
+ /**
* The names of <meta-data> in the WebAPK's AndroidManifest.xml whose values are needed to
* determine whether a WebAPK needs to be upgraded but which are not present in
* {@link WebappInfo}. The names must stay in sync with
@@ -37,12 +44,20 @@ public class ManifestUpgradeDetector implements ManifestUpgradeDetectorFetcher.C
* Fetches the WebAPK's Web Manifest from the web.
*/
private ManifestUpgradeDetectorFetcher mFetcher;
+ private CheckIfUpgradeNeededCallback mUpgradeCheckCallback;
pkotwicz 2016/08/11 22:02:43 Nit: Just rename this member to "mCallback"
Xi Han 2016/08/15 21:38:44 Done.
private static final String TAG = "cr_UpgradeDetector";
- public ManifestUpgradeDetector(Tab tab, WebappInfo info) {
+ public ManifestUpgradeDetector(Tab tab, WebappInfo info,
+ CheckIfUpgradeNeededCallback callback) {
mTab = tab;
mWebappInfo = info;
+ mUpgradeCheckCallback = callback;
+ getMetaDataFromAndroidManifest();
+ }
+
+ public boolean isWebContentsGone() {
+ return mTab == null || mTab.getWebContents() == null;
pkotwicz 2016/08/11 22:02:43 Why are you checking whether |mTab| is null? Isn't
Xi Han 2016/08/15 21:38:44 As discussed offline, move this check to |Manifest
}
/**
@@ -56,7 +71,6 @@ public class ManifestUpgradeDetector implements ManifestUpgradeDetectorFetcher.C
if (mFetcher != null) return;
- getMetaDataFromAndroidManifest();
mFetcher = createFetcher(
mTab, mWebappInfo.scopeUri().toString(), mWebappInfo.webManifestUri().toString());
mFetcher.start(this);
@@ -106,9 +120,9 @@ public class ManifestUpgradeDetector implements ManifestUpgradeDetectorFetcher.C
scopeUrl, mWebappInfo.encodedIcon(), name, shortName, displayMode, orientation,
mWebappInfo.source(), themeColor, backgroundColor, mWebappInfo.isIconGenerated(),
mWebappInfo.webApkPackageName(), mWebappInfo.webManifestUri().toString());
- if (requireUpgrade(newInfo)) {
- upgrade();
- }
+ boolean isUpgraded = requireUpgrade(newInfo);
pkotwicz 2016/08/11 22:02:43 Nit: I think that |upgradeRequired| is a more appr
Yaron 2016/08/12 21:16:16 same with the method name (I thought I commented o
Xi Han 2016/08/15 21:38:44 Done.
+ mUpgradeCheckCallback.onCheckIfUpdateNeededFinished(
+ isUpgraded, isUpgraded ? newInfo : null);
onComplete();
Yaron 2016/08/12 21:16:16 i would remove this as well. the callback is likel
Xi Han 2016/08/15 21:38:44 Hmm, this function is used by ManifestUpgradeDetec
}
@@ -141,7 +155,5 @@ public class ManifestUpgradeDetector implements ManifestUpgradeDetectorFetcher.C
return false;
}
- protected void upgrade() {}
-
protected void onComplete() {}
}

Powered by Google App Engine
This is Rietveld 408576698