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

Unified Diff: chrome/browser/push_messaging/push_messaging_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/permissions/permission_context.cc ('k') | chrome/chrome_browser.gypi » ('j') | extensions/browser/info_map.cc » ('J')
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 d29f5c31f7ac0121ee3d91bfc505299a63ffb2d3..7806a666762614478aa317054e787d3267fe7227 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/permission_context_uma_util.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/permissions/permission_request_id.h"

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

#include "components/content_settings/core/browser/host_content_settings_map.h"

@@ -37,12 +37,12 @@ ContentSetting PushMessagingPermissionContext::GetPermissionStatus(

profile_->GetHostContentSettingsMap()->GetContentSetting(

requesting_origin, embedding_origin, kPushSettingType, std::string());

- DesktopNotificationService* notification_service =

- DesktopNotificationServiceFactory::GetForProfile(profile_);

- DCHECK(notification_service);

+ NotificationPermissionContext* notification_context =

+ NotificationPermissionContextFactory::GetForProfile(profile_);

+ DCHECK(notification_context);

ContentSetting notifications_permission =

- notification_service->GetPermissionStatus(requesting_origin,

+ notification_context->GetPermissionStatus(requesting_origin,

embedding_origin);

if (notifications_permission == CONTENT_SETTING_BLOCK ||

@@ -87,11 +87,12 @@ void PushMessagingPermissionContext::DecidePermission(

false /* persist */, CONTENT_SETTING_BLOCK);

return;

}

- DesktopNotificationService* notification_service =

- DesktopNotificationServiceFactory::GetForProfile(profile_);

- DCHECK(notification_service);

- notification_service->RequestPermission(

+ NotificationPermissionContext* notification_context =

+ NotificationPermissionContextFactory::GetForProfile(profile_);

+ DCHECK(notification_context);

mlamouri (slow - plz ping) 2015/06/29 10:57:42 I'm wondering: should PushPermissionContext::Reset

Peter Beverloo 2015/06/29 12:54:21 Not as long as we keep a separate content setting,

+ notification_context->RequestPermission(

web_contents, id, requesting_origin, user_gesture,

base::Bind(&PushMessagingPermissionContext::DecidePushPermission,

weak_factory_ui_thread_.GetWeakPtr(), id, requesting_origin,