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

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: nbuild ch 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
« no previous file with comments | « chrome/browser/android/shortcut_helper.cc ('k') | tools/metrics/histograms/histograms.xml » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 9dd91b44145ed2eb15b2ac537256af5ec2918d1d..ab02b49c0eeb4f9ad63d13964cef00b0a7b642c7 100644
--- a/chrome/browser/notifications/notification_platform_bridge_android.cc
+++ b/chrome/browser/notifications/notification_platform_bridge_android.cc
@@ -183,19 +183,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_, j_scope_url);
- } else {
- webapk_package = ConvertUTF8ToJavaString(env, "");
- }
+ ScopedJavaLocalRef<jstring> webapk_package =
+ Java_NotificationPlatformBridge_queryWebApkPackage(
+ env, java_object_, j_scope_url);
ScopedJavaLocalRef<jstring> j_notification_id =
ConvertUTF8ToJavaString(env, notification_id);
« no previous file with comments | « chrome/browser/android/shortcut_helper.cc ('k') | tools/metrics/histograms/histograms.xml » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698