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

Unified Diff: chrome/browser/notifications/notification_platform_bridge_android.cc

Issue 2242473002: Add an about:flag to control WebApk enablement. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix last native reference 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/browser/notifications/notification_platform_bridge_android.cc
diff --git a/chrome/browser/notifications/notification_platform_bridge_android.cc b/chrome/browser/notifications/notification_platform_bridge_android.cc
index 3dd82ff26940caf494f35f4ae46823dcc9bd85dc..f2cf255cf3f7350cec8510d89559cefcf8afc844 100644
--- a/chrome/browser/notifications/notification_platform_bridge_android.cc
+++ b/chrome/browser/notifications/notification_platform_bridge_android.cc
@@ -184,19 +184,15 @@ void NotificationPlatformBridgeAndroid::Display(
DCHECK_EQ(notification_type, NotificationCommon::PERSISTENT);
GURL origin_url(notification.origin_url().GetOrigin());
- ScopedJavaLocalRef<jstring> webapk_package;
- if (base::CommandLine::ForCurrentProcess()->HasSwitch(
- switches::kEnableWebApk)) {
- GURL scope_url(notification.service_worker_scope());
- if (!scope_url.is_valid())
- scope_url = origin_url;
- ScopedJavaLocalRef<jstring> j_scope_url =
+
+ GURL scope_url(notification.service_worker_scope());
+ if (!scope_url.is_valid())
+ scope_url = origin_url;
+ ScopedJavaLocalRef<jstring> j_scope_url =
ConvertUTF8ToJavaString(env, scope_url.spec());
- webapk_package = Java_NotificationPlatformBridge_queryWebApkPackage(
- env, java_object_.obj(), j_scope_url.obj());
- } else {
- webapk_package = ConvertUTF8ToJavaString(env, "");
- }
+ ScopedJavaLocalRef<jstring> webapk_package =
+ Java_NotificationPlatformBridge_queryWebApkPackage(
+ env, java_object_.obj(), j_scope_url.obj());
ScopedJavaLocalRef<jstring> j_notification_id =
ConvertUTF8ToJavaString(env, notification_id);

Powered by Google App Engine
This is Rietveld 408576698