chrome/browser/permissions/permission_manager.cc - Issue 2149883002: Use the same codepath for NOTIFICATIONS and PUSH_MESSAGING permissions

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/permissions/permission_manager.cc

Issue 2149883002: Use the same codepath for NOTIFICATIONS and PUSH_MESSAGING permissions (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: . Created 4 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

« no previous file with comments | « chrome/browser/notifications/notification_permission_context_unittest.cc ('k') | chrome/browser/permissions/permission_request_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/permissions/permission_manager.cc

diff --git a/chrome/browser/permissions/permission_manager.cc b/chrome/browser/permissions/permission_manager.cc

index 7e12ed8e77aaa71e2c7a4175d7177f6a86407e4e..8f360de789e03513bf28561fcaf7de930d27fa59 100644

--- a/chrome/browser/permissions/permission_manager.cc

+++ b/chrome/browser/permissions/permission_manager.cc

@@ -19,7 +19,6 @@

#include "chrome/browser/permissions/permission_request_id.h"

#include "chrome/browser/permissions/permission_uma_util.h"

#include "chrome/browser/profiles/profile.h"

-#include "chrome/browser/push_messaging/push_messaging_permission_context.h"

#include "chrome/browser/storage/durable_storage_permission_context.h"

#include "chrome/browser/tab_contents/tab_util.h"

#include "chrome/common/features.h"

@@ -222,9 +221,11 @@ PermissionManager::PermissionManager(Profile* profile)

permission_contexts_[PermissionType::MIDI_SYSEX] =

base::WrapUnique(new MidiPermissionContext(profile));

permission_contexts_[PermissionType::PUSH_MESSAGING] =

- base::WrapUnique(new PushMessagingPermissionContext(profile));

+ base::WrapUnique(new NotificationPermissionContext(

+ profile, PermissionType::PUSH_MESSAGING));

permission_contexts_[PermissionType::NOTIFICATIONS] =

- base::WrapUnique(new NotificationPermissionContext(profile));

+ base::WrapUnique(new NotificationPermissionContext(

+ profile, PermissionType::NOTIFICATIONS));

#if !BUILDFLAG(ANDROID_JAVA_UI)

permission_contexts_[PermissionType::GEOLOCATION] =

base::WrapUnique(new GeolocationPermissionContext(profile));