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

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

Issue 2965233003: [Android WebAPK] Make variations only control whether WebAPKs can be installed (Closed)
Patch Set: Merge branch 'master' into chrome_webapk_host Created 3 years, 5 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/notifications/NotificationPlatformBridge.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/notifications/NotificationPlatformBridge.java b/chrome/android/java/src/org/chromium/chrome/browser/notifications/NotificationPlatformBridge.java
index c0aa956dffe31ab8d34d02af2b612058b1e4c55e..681dc1f6482840be0f6af0f59c1ab8febd90bebb 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/notifications/NotificationPlatformBridge.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/notifications/NotificationPlatformBridge.java
@@ -40,7 +40,6 @@ import org.chromium.chrome.browser.preferences.PreferencesLauncher;
import org.chromium.chrome.browser.preferences.website.SingleCategoryPreferences;
import org.chromium.chrome.browser.preferences.website.SingleWebsitePreferences;
import org.chromium.chrome.browser.preferences.website.SiteSettingsCategory;
-import org.chromium.chrome.browser.webapps.ChromeWebApkHost;
import org.chromium.components.url_formatter.UrlFormatter;
import org.chromium.webapk.lib.client.WebApkValidator;
@@ -155,8 +154,6 @@ public class NotificationPlatformBridge {
*/
@CalledByNative
private String queryWebApkPackage(String url) {
- if (!ChromeWebApkHost.isEnabled()) return "";
-
String webApkPackage =
WebApkValidator.queryWebApkPackage(ContextUtils.getApplicationContext(), url);
return webApkPackage == null ? "" : webApkPackage;
@@ -191,13 +188,10 @@ public class NotificationPlatformBridge {
Log.i(TAG, "Dispatching notification event to native: " + notificationId);
if (NotificationConstants.ACTION_CLICK_NOTIFICATION.equals(intent.getAction())) {
- String webApkPackage = "";
- if (ChromeWebApkHost.isEnabled()) {
- webApkPackage = intent.getStringExtra(
+ String webApkPackage = intent.getStringExtra(
NotificationConstants.EXTRA_NOTIFICATION_INFO_WEBAPK_PACKAGE);
- if (webApkPackage == null) {
- webApkPackage = "";
- }
+ if (webApkPackage == null) {
+ webApkPackage = "";
}
int actionIndex = intent.getIntExtra(
NotificationConstants.EXTRA_NOTIFICATION_INFO_ACTION_INDEX, -1);

Powered by Google App Engine
This is Rietveld 408576698