chrome/browser/push_messaging/push_messaging_permission_context.cc - Issue 1871343002: Remove PermissionContext factories

Unified Diff: chrome/browser/push_messaging/push_messaging_permission_context.cc

Issue 1871343002: Remove PermissionContext factories (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 4 years, 8 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/permissions/permission_manager.cc ('K') | « chrome/browser/profiles/profile_impl.cc ('k') | chrome/browser/push_messaging/push_messaging_permission_context_factory.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/push_messaging/push_messaging_permission_context.cc

diff --git a/chrome/browser/push_messaging/push_messaging_permission_context.cc b/chrome/browser/push_messaging/push_messaging_permission_context.cc

index 2214145796414bc0fb034c4676e9481b72b71bf5..3054115d12eb73f1193d07e5deb1950c104ecada 100644

--- a/chrome/browser/push_messaging/push_messaging_permission_context.cc

+++ b/chrome/browser/push_messaging/push_messaging_permission_context.cc

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

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

#include "chrome/browser/content_settings/host_content_settings_map_factory.h"

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

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

+#include "chrome/browser/permissions/permission_manager.h"

+#include "chrome/browser/permissions/permission_manager_factory.h"

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

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

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

@@ -41,13 +41,13 @@ ContentSetting PushMessagingPermissionContext::GetPermissionStatus(

PermissionContextBase::GetPermissionStatus(requesting_origin,

embedding_origin);

- NotificationPermissionContext* notification_context =

- NotificationPermissionContextFactory::GetForProfile(profile_);

- DCHECK(notification_context);

+ PermissionContextBase* notification_permission_context =

+ PermissionManagerFactory::GetForProfile(profile_)->GetPermissionContext(

+ content::PermissionType::NOTIFICATIONS);

ContentSetting notifications_permission =

- notification_context->GetPermissionStatus(requesting_origin,

- embedding_origin);

+ notification_permission_context->GetPermissionStatus(requesting_origin,

+ embedding_origin);

mlamouri (slow - plz ping) 2016/04/11 14:06:06 As above, I think we can abstract out the Permissi

raymes 2016/04/12 07:44:54 Done.

if (notifications_permission == CONTENT_SETTING_BLOCK ||

push_content_setting == CONTENT_SETTING_BLOCK) {

@@ -88,11 +88,11 @@ void PushMessagingPermissionContext::DecidePermission(

return;

}

- NotificationPermissionContext* notification_context =

- NotificationPermissionContextFactory::GetForProfile(profile_);

- DCHECK(notification_context);

+ PermissionContextBase* notification_permission_context =

+ PermissionManagerFactory::GetForProfile(profile_)->GetPermissionContext(

+ content::PermissionType::NOTIFICATIONS);

- notification_context->RequestPermission(

+ notification_permission_context->RequestPermission(

mlamouri (slow - plz ping) 2016/04/11 14:06:05 ditto

raymes 2016/04/12 07:44:54 Done.

web_contents, id, requesting_origin,

base::Bind(&PushMessagingPermissionContext::DecidePushPermission,

weak_factory_ui_thread_.GetWeakPtr(), id, requesting_origin,