chrome/browser/permissions/permission_context.cc - Issue 1207363002: Simplify permission-related code for Web Notifications.

Unified Diff: chrome/browser/permissions/permission_context.cc

Issue 1207363002: Simplify permission-related code for Web Notifications. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

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

« chrome/browser/notifications/notification_permission_context_unittest.cc ('K') | « chrome/browser/notifications/platform_notification_service_impl.cc ('k') | chrome/browser/push_messaging/push_messaging_permission_context.cc » ('j') | chrome/browser/push_messaging/push_messaging_permission_context.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/permissions/permission_context.cc

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

index cdd2b10801c7ed4ae769cb065b41976b5f708877..e2c4acbbc8edbe9f53c1406027d573c07acad404 100644

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

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

@@ -8,8 +8,8 @@

#include "chrome/browser/geolocation/geolocation_permission_context_factory.h"

#include "chrome/browser/media/midi_permission_context.h"

#include "chrome/browser/media/midi_permission_context_factory.h"

-#include "chrome/browser/notifications/desktop_notification_service.h"

-#include "chrome/browser/notifications/desktop_notification_service_factory.h"

+#include "chrome/browser/notifications/notification_permission_context.h"

+#include "chrome/browser/notifications/notification_permission_context_factory.h"

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

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

#include "chrome/browser/push_messaging/push_messaging_permission_context_factory.h"

@@ -30,10 +30,10 @@ PermissionContextBase* PermissionContext::Get(Profile* profile,

switch (permission_type) {

case PermissionType::GEOLOCATION:

return GeolocationPermissionContextFactory::GetForProfile(profile);

- case PermissionType::NOTIFICATIONS:

- return DesktopNotificationServiceFactory::GetForProfile(profile);

case PermissionType::MIDI_SYSEX:

return MidiPermissionContextFactory::GetForProfile(profile);

+ case PermissionType::NOTIFICATIONS:

+ return NotificationPermissionContextFactory::GetForProfile(profile);

case PermissionType::PUSH_MESSAGING:

return PushMessagingPermissionContextFactory::GetForProfile(profile);

#if defined(OS_ANDROID) || defined(OS_CHROMEOS)

@@ -57,8 +57,8 @@ const std::list<KeyedServiceBaseFactory*>& PermissionContext::GetFactories() {

if (factories.empty()) {

factories.push_back(GeolocationPermissionContextFactory::GetInstance());

- factories.push_back(DesktopNotificationServiceFactory::GetInstance());

factories.push_back(MidiPermissionContextFactory::GetInstance());

+ factories.push_back(NotificationPermissionContextFactory::GetInstance());

factories.push_back(PushMessagingPermissionContextFactory::GetInstance());

#if defined(OS_ANDROID) || defined(OS_CHROMEOS)

factories.push_back(