chrome/browser/android/preferences/website_preference_bridge.cc - Issue 2020063003: Use GetPermissionStatus instead of DesktopNotificationProfileUtil::GetContentSetting

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/android/preferences/website_preference_bridge.cc

Issue 2020063003: Use GetPermissionStatus instead of DesktopNotificationProfileUtil::GetContentSetting (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: remove embber param for notifications Created 4 years, 6 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/android/java/src/org/chromium/chrome/browser/preferences/website/WebsitePreferenceBridge.java ('k') | chrome/browser/extensions/service_worker_apitest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/android/preferences/website_preference_bridge.cc

diff --git a/chrome/browser/android/preferences/website_preference_bridge.cc b/chrome/browser/android/preferences/website_preference_bridge.cc

index 62f8784ad826e58770d414d87097f71c5e294a26..4568725bf419d56043712a4af8d4b63adae9a412 100644

--- a/chrome/browser/android/preferences/website_preference_bridge.cc

+++ b/chrome/browser/android/preferences/website_preference_bridge.cc

@@ -313,11 +313,9 @@ static jint GetNotificationSettingForOrigin(

JNIEnv* env,

const JavaParamRef<jclass>& clazz,

const JavaParamRef<jstring>& origin,

- const JavaParamRef<jstring>& embedder,

jboolean is_incognito) {

- return DesktopNotificationProfileUtil::GetContentSetting(

- GetActiveUserProfile(is_incognito),

- GURL(ConvertJavaStringToUTF8(env, origin)));

+ return GetSettingForOrigin(env, CONTENT_SETTINGS_TYPE_NOTIFICATIONS,

+ origin, origin, is_incognito);

}

static void SetNotificationSettingForOrigin(