Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1421)

Unified Diff: chrome/browser/notifications/desktop_notification_service.h

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
« no previous file with comments | « no previous file | chrome/browser/notifications/desktop_notification_service.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/notifications/desktop_notification_service.h
diff --git a/chrome/browser/notifications/desktop_notification_service.h b/chrome/browser/notifications/desktop_notification_service.h
index 7faaca2a02e52435ad4991fec736a53048ab6ec5..8ffe1e9ae83044636c5aa10c1511c2714539c1d5 100644
--- a/chrome/browser/notifications/desktop_notification_service.h
+++ b/chrome/browser/notifications/desktop_notification_service.h
@@ -7,21 +7,14 @@
#include <set>
#include <string>
-#include <vector>
#include "base/basictypes.h"
-#include "base/callback_forward.h"
#include "base/memory/ref_counted.h"
#include "base/memory/scoped_ptr.h"
-#include "base/memory/weak_ptr.h"
#include "base/prefs/pref_member.h"
#include "base/scoped_observer.h"
-#include "base/strings/string16.h"
-#include "chrome/browser/content_settings/permission_context_base.h"
-#include "components/content_settings/core/common/content_settings.h"
#include "components/keyed_service/core/keyed_service.h"
#include "ui/message_center/notifier_settings.h"
-#include "url/gurl.h"
#if defined(ENABLE_EXTENSIONS)
#include "extensions/browser/extension_registry_observer.h"
@@ -41,10 +34,9 @@ class PrefRegistrySyncable;
// The DesktopNotificationService is an object, owned by the Profile,
// which provides the creation of desktop "toasts" to web pages and workers.
-class DesktopNotificationService : public PermissionContextBase
+class DesktopNotificationService : public KeyedService
#if defined(ENABLE_EXTENSIONS)
- ,
- public extensions::ExtensionRegistryObserver
+ , public extensions::ExtensionRegistryObserver
#endif
{
public:
@@ -54,15 +46,6 @@ class DesktopNotificationService : public PermissionContextBase
explicit DesktopNotificationService(Profile* profile);
~DesktopNotificationService() override;
- // Requests Web Notification permission for |requesting_frame|. The |callback|
- // will be invoked after the user has made a decision.
- void RequestNotificationPermission(
- content::WebContents* web_contents,
- const PermissionRequestID& request_id,
- const GURL& requesting_origin,
- bool user_gesture,
- const BrowserPermissionCallback& result_callback);
-
// Returns true if the notifier with |notifier_id| is allowed to send
// notifications.
bool IsNotifierEnabled(const message_center::NotifierId& notifier_id) const;
@@ -90,12 +73,6 @@ class DesktopNotificationService : public PermissionContextBase
extensions::UninstallReason reason) override;
#endif
- // PermissionContextBase:
- void UpdateContentSetting(const GURL& requesting_origin,
- const GURL& embedder_origin,
- ContentSetting content_setting) override;
- bool IsRestrictedToSecureOrigins() const override;
-
// The profile which owns this object.
Profile* profile_;
« no previous file with comments | « no previous file | chrome/browser/notifications/desktop_notification_service.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698