Chromium Code Reviews| Index: chrome/android/java/src/org/chromium/chrome/browser/webapps/ChromeWebApkHost.java |
| diff --git a/chrome/android/java/src/org/chromium/chrome/browser/webapps/ChromeWebApkHost.java b/chrome/android/java/src/org/chromium/chrome/browser/webapps/ChromeWebApkHost.java |
| index 3ca4a81dc52613c0a44094481c4d388412375046..7e809d1e75de5e83f2b5e53bd7c7e65ddf85eed7 100644 |
| --- a/chrome/android/java/src/org/chromium/chrome/browser/webapps/ChromeWebApkHost.java |
| +++ b/chrome/android/java/src/org/chromium/chrome/browser/webapps/ChromeWebApkHost.java |
| @@ -8,12 +8,14 @@ import android.content.Context; |
| import android.os.StrictMode; |
| import android.provider.Settings; |
| +import org.chromium.base.CommandLine; |
| import org.chromium.base.ContextUtils; |
| import org.chromium.base.Log; |
| import org.chromium.base.annotations.CalledByNative; |
| import org.chromium.base.library_loader.LibraryLoader; |
| import org.chromium.chrome.browser.AppHooks; |
| import org.chromium.chrome.browser.ChromeFeatureList; |
| +import org.chromium.chrome.browser.ChromeSwitches; |
| import org.chromium.chrome.browser.GooglePlayInstallState; |
| import org.chromium.chrome.browser.externalauth.ExternalAuthUtils; |
| import org.chromium.chrome.browser.externalauth.UserRecoverableErrorHandler; |
| @@ -32,7 +34,9 @@ public class ChromeWebApkHost { |
| private static Boolean sEnabledForTesting; |
| public static void init() { |
| - WebApkValidator.initWithBrowserHostSignature(ChromeWebApkHostSignature.EXPECTED_SIGNATURE); |
| + WebApkValidator.init( |
| + CommandLine.getInstance().hasSwitch(ChromeSwitches.ENABLE_ANY_WEBAPK_PACKAGE_NAME), |
|
Yaron
2017/04/10 14:17:33
Hmm, does this actually work when loaded in chrome
ScottK
2017/04/13 12:04:00
Done.
|
| + ChromeWebApkHostSignature.EXPECTED_SIGNATURE, ChromeWebApkHostSignature.PUBLIC_KEY); |
| } |
| public static void initForTesting(boolean enabled) { |