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..0d485da5ce3ef765f0d040d8c5db0ab1144b2754 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 |
@@ -43,6 +43,7 @@ public class ManifestUpgradeDetector implements ManifestUpgradeDetectorFetcher.C |
public ManifestUpgradeDetector(Tab tab, WebappInfo info) { |
mTab = tab; |
mWebappInfo = info; |
+ getMetaDataFromAndroidManifest(); |
Yaron
2016/08/10 02:26:27
why was this moved? It seems to only set mStartUrl
Xi Han
2016/08/11 19:01:13
We will guarantee that this function is only calle
|
} |
/** |
@@ -56,7 +57,6 @@ public class ManifestUpgradeDetector implements ManifestUpgradeDetectorFetcher.C |
if (mFetcher != null) return; |
- getMetaDataFromAndroidManifest(); |
mFetcher = createFetcher( |
mTab, mWebappInfo.scopeUri().toString(), mWebappInfo.webManifestUri().toString()); |
mFetcher.start(this); |
@@ -107,7 +107,7 @@ public class ManifestUpgradeDetector implements ManifestUpgradeDetectorFetcher.C |
mWebappInfo.source(), themeColor, backgroundColor, mWebappInfo.isIconGenerated(), |
mWebappInfo.webApkPackageName(), mWebappInfo.webManifestUri().toString()); |
if (requireUpgrade(newInfo)) { |
- upgrade(); |
+ upgrade(newInfo); |
} |
onComplete(); |
@@ -141,7 +141,9 @@ public class ManifestUpgradeDetector implements ManifestUpgradeDetectorFetcher.C |
return false; |
} |
- protected void upgrade() {} |
+ private void upgrade(WebappInfo newInfo) { |
Yaron
2016/08/10 02:26:27
nit: inline this function
Xi Han
2016/08/11 19:01:13
Replace it with a callback.
|
+ WebApkUpdateManager.updateAsync(newInfo); |
+ } |
protected void onComplete() {} |
} |