chrome/browser/services/gcm/push_messaging_service_impl.cc - Issue 955673004: Move gcm-independent parts of push messaging out of gcm namespace and directory

Unified Diff: chrome/browser/services/gcm/push_messaging_service_impl.cc

Issue 955673004: Move gcm-independent parts of push messaging out of gcm namespace and directory (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 5 years, 10 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/push_messaging/push_messaging_permission_context_factory.h ('K') | « chrome/browser/services/gcm/push_messaging_service_impl.h ('k') | chrome/chrome_browser.gypi » ('j') | chrome/chrome_browser.gypi » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/services/gcm/push_messaging_service_impl.cc

diff --git a/chrome/browser/services/gcm/push_messaging_service_impl.cc b/chrome/browser/services/gcm/push_messaging_service_impl.cc

index 49b36d0d6ccda564f872888fecc1f16b29b6d8a4..f1ed088978eec10ee594d317193176ed6c0eea8b 100644

--- a/chrome/browser/services/gcm/push_messaging_service_impl.cc

+++ b/chrome/browser/services/gcm/push_messaging_service_impl.cc

@@ -18,12 +18,12 @@

#include "chrome/browser/notifications/notification_ui_manager.h"

#include "chrome/browser/notifications/platform_notification_service_impl.h"

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

+#include "chrome/browser/push_messaging/push_messaging_application_id.h"

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

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

#include "chrome/browser/services/gcm/gcm_profile_service.h"

#include "chrome/browser/services/gcm/gcm_profile_service_factory.h"

-#include "chrome/browser/services/gcm/push_messaging_application_id.h"

#include "chrome/browser/services/gcm/push_messaging_constants.h"

-#include "chrome/browser/services/gcm/push_messaging_permission_context.h"

-#include "chrome/browser/services/gcm/push_messaging_permission_context_factory.h"

#include "chrome/common/chrome_switches.h"

#include "chrome/common/pref_names.h"

#include "chrome/grit/generated_resources.h"

@@ -494,8 +494,8 @@ void PushMessagingServiceImpl::RegisterFromDocument(

const PermissionRequestID id(

renderer_id, web_contents->GetRoutingID(), bridge_id, GURL());

- gcm::PushMessagingPermissionContext* permission_context =

- gcm::PushMessagingPermissionContextFactory::GetForProfile(profile_);

+ PushMessagingPermissionContext* permission_context =

+ PushMessagingPermissionContextFactory::GetForProfile(profile_);

if (permission_context == NULL || !user_visible_only) {

RegisterEnd(callback,

@@ -775,8 +775,8 @@ void PushMessagingServiceImpl::UnregisterBecausePermissionRevoked(

// Helper methods --------------------------------------------------------------

bool PushMessagingServiceImpl::HasPermission(const GURL& origin) {

- gcm::PushMessagingPermissionContext* permission_context =

- gcm::PushMessagingPermissionContextFactory::GetForProfile(profile_);

+ PushMessagingPermissionContext* permission_context =

+ PushMessagingPermissionContextFactory::GetForProfile(profile_);

DCHECK(permission_context);

return permission_context->GetPermissionStatus(origin, origin) ==