Chromium Code Reviews| Index: chrome/browser/android/webapk/manifest_upgrade_detector_fetcher.cc |
| diff --git a/chrome/browser/android/webapk/manifest_upgrade_detector_fetcher.cc b/chrome/browser/android/webapk/manifest_upgrade_detector_fetcher.cc |
| index 5fbadeef78523aebb7a94f2ca5f8091cdf21392d..f479ee2edeb51521218be452bc726dccebe1946b 100644 |
| --- a/chrome/browser/android/webapk/manifest_upgrade_detector_fetcher.cc |
| +++ b/chrome/browser/android/webapk/manifest_upgrade_detector_fetcher.cc |
| @@ -10,6 +10,7 @@ |
| #include "base/android/jni_string.h" |
| #include "chrome/browser/android/shortcut_helper.h" |
| #include "chrome/browser/android/shortcut_info.h" |
| +#include "chrome/browser/android/webapk/webapk_web_manifest_checker.h" |
| #include "chrome/browser/installable/installable_manager.h" |
| #include "content/public/browser/render_frame_host.h" |
| #include "content/public/browser/web_contents.h" |
| @@ -135,8 +136,10 @@ void ManifestUpgradeDetectorFetcher::OnDidGetInstallableData( |
| // TODO(pkotwicz): Tell Java side that the Web Manifest was fetched but the |
| // Web Manifest is not WebAPK-compatible. (http://crbug.com/639536) |
| - if (!data.is_installable) |
| + if (CheckWebManifestUrlsWebApkCompatible(data.manifest) != |
| + NO_ERROR_DETECTED) { |
|
dominickn
2016/08/24 03:27:11
Do you still want to check data.installable here?
pkotwicz
2016/08/24 15:04:56
Yes I do. Thank you for catching this bug!
|
| return; |
| + } |
| ShortcutInfo info(GURL::EmptyGURL()); |
| info.UpdateFromManifest(data.manifest); |