| Index: chrome/browser/push_messaging/push_messaging_permission_context.cc
|
| diff --git a/chrome/browser/services/gcm/push_messaging_permission_context.cc b/chrome/browser/push_messaging/push_messaging_permission_context.cc
|
| similarity index 97%
|
| rename from chrome/browser/services/gcm/push_messaging_permission_context.cc
|
| rename to chrome/browser/push_messaging/push_messaging_permission_context.cc
|
| index bb39adce372104e099fdf73788a3e546eb9621db..5f2cc5484854c6e703689ebf5669bb6e16b150a6 100644
|
| --- a/chrome/browser/services/gcm/push_messaging_permission_context.cc
|
| +++ b/chrome/browser/push_messaging/push_messaging_permission_context.cc
|
| @@ -1,8 +1,8 @@
|
| -// Copyright 2014 The Chromium Authors. All rights reserved.
|
| +// Copyright 2015 The Chromium Authors. All rights reserved.
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#include "chrome/browser/services/gcm/push_messaging_permission_context.h"
|
| +#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"
|
| @@ -17,8 +17,6 @@
|
| const ContentSettingsType kPushSettingType =
|
| CONTENT_SETTINGS_TYPE_PUSH_MESSAGING;
|
|
|
| -namespace gcm {
|
| -
|
| PushMessagingPermissionContext::PushMessagingPermissionContext(Profile* profile)
|
| : PermissionContextBase(profile, CONTENT_SETTINGS_TYPE_PUSH_MESSAGING),
|
| profile_(profile),
|
| @@ -138,5 +136,3 @@ void PushMessagingPermissionContext::DecidePushPermission(
|
| NotifyPermissionSet(id, requesting_origin, embedding_origin, callback,
|
| true /* persist */, true /* granted */);
|
| }
|
| -} // namespace gcm
|
| -
|
|
|