Migrate the notification permission to the new common permission classes.

chrome/browser/notifications/desktop_notification_profile_util.cc

Index: chrome/browser/notifications/desktop_notification_profile_util.cc
diff --git a/chrome/browser/notifications/desktop_notification_profile_util.cc b/chrome/browser/notifications/desktop_notification_profile_util.cc
new file mode 100644
index 0000000000000000000000000000000000000000..d3e3b968bb09600a2c2a2e764a383524ecaace69
--- /dev/null
+++ b/chrome/browser/notifications/desktop_notification_profile_util.cc
@@ -0,0 +1,83 @@
+// Copyright 2014 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/notifications/desktop_notification_profile_util.h"
+
+#include "chrome/browser/content_settings/content_settings_provider.h"
+#include "chrome/browser/content_settings/host_content_settings_map.h"
+#include "chrome/browser/profiles/profile.h"
+#include "chrome/common/content_settings_pattern.h"
+

[Peter Beverloo, 2014/07/18 10:42:38]

micro nit: two white lines -> one of 'em.

[Miguel Garcia, 2014/07/18 12:27:09]

Done.

+
+void DesktopNotificationProfileUtil::ResetToDefaultContentSetting(
+    Profile* profile) {
+  profile->GetHostContentSettingsMap()->SetDefaultContentSetting(

[Peter Beverloo, 2014/07/18 10:42:38]

I'm in flux. Nothing in this class uses anything from Profile other than
HostContentSettingsMap, so I'm erring towards naming this
/DesktopNotificationContentSettingsUtil/ taking HostContentSettingsMap* rather
than Profile*.

However, that'd increase noise for all the callees, given that they have the
Profile, and we'd have to call GetHostContentSettingsMap() everywhere.

Fine to leave as it is...

[Miguel Garcia, 2014/07/18 12:27:08]

Acknowledged.

+      CONTENT_SETTINGS_TYPE_NOTIFICATIONS, CONTENT_SETTING_DEFAULT);
+}
+
+// Clears the notifications setting for the given pattern.
+void DesktopNotificationProfileUtil::ClearSetting(

[Peter Beverloo, 2014/07/18 10:42:38]

static methods should be annotated with a comment that says "// static". The
comments about what the methods do are much more useful in the header file.

[Miguel Garcia, 2014/07/18 12:27:09]

I think we usually do this when the class has both static and not static
methods. This class only allows static methods (it has a private constructor) so
I think it's clear and would add noise to add //static to every single method in
the file.

On 2014/07/18 10:42:38, Peter Beverloo wrote:

+    Profile* profile, const ContentSettingsPattern& pattern) {
+  profile->GetHostContentSettingsMap()->SetContentSetting(
+      pattern,
+      ContentSettingsPattern::Wildcard(),
+      CONTENT_SETTINGS_TYPE_NOTIFICATIONS,
+      NO_RESOURCE_IDENTIFIER,
+      CONTENT_SETTING_DEFAULT);
+
+}
+
+// Clears the sets of explicitly allowed and denied origins.
+void DesktopNotificationProfileUtil::ResetAllOrigins(Profile* profile) {

[Peter Beverloo, 2014/07/18 10:42:38]

This method is only used for NotificationTest. Can we drop this from this class,
and instead just implement it in NotificationTest::AllowAllOrigins()?

[Miguel Garcia, 2014/07/18 12:27:09]

Good idea, it was only used once in the test so I just inlined it.

+  profile->GetHostContentSettingsMap()->ClearSettingsForOneType(
+       CONTENT_SETTINGS_TYPE_NOTIFICATIONS);
+}
+
+// Methods to setup and modify permission preferences.
+void DesktopNotificationProfileUtil::GrantPermission(
+    Profile* profile, const GURL& origin) {
+    ContentSettingsPattern primary_pattern =
+        ContentSettingsPattern::FromURLNoWildcard(origin);
+    profile->GetHostContentSettingsMap()->SetContentSetting(
+        primary_pattern,
+        ContentSettingsPattern::Wildcard(),
+        CONTENT_SETTINGS_TYPE_NOTIFICATIONS,
+        NO_RESOURCE_IDENTIFIER,
+        CONTENT_SETTING_ALLOW);
+}
+
+void DesktopNotificationProfileUtil::DenyPermission(
+    Profile* profile, const GURL& origin) {
+    ContentSettingsPattern primary_pattern =
+        ContentSettingsPattern::FromURLNoWildcard(origin);
+    profile->GetHostContentSettingsMap()->SetContentSetting(
+        primary_pattern,
+        ContentSettingsPattern::Wildcard(),
+        CONTENT_SETTINGS_TYPE_NOTIFICATIONS,
+        NO_RESOURCE_IDENTIFIER,
+        CONTENT_SETTING_BLOCK);
+}
+
+void DesktopNotificationProfileUtil::GetNotificationsSettings(
+    Profile* profile, ContentSettingsForOneType* settings) {
+  profile->GetHostContentSettingsMap()->GetSettingsForOneType(
+      CONTENT_SETTINGS_TYPE_NOTIFICATIONS,
+      NO_RESOURCE_IDENTIFIER,
+      settings);
+}
+
+ContentSetting DesktopNotificationProfileUtil::GetContentSetting(
+    Profile* profile, const GURL& origin) {
+  return profile->GetHostContentSettingsMap()->GetContentSetting(
+      origin,
+      origin,
+      CONTENT_SETTINGS_TYPE_NOTIFICATIONS,
+      NO_RESOURCE_IDENTIFIER);
+}
+
+void DesktopNotificationProfileUtil::SetDefaultContentSetting(

[Peter Beverloo, 2014/07/18 10:42:38]

Dito, we can implement this as a helper method in NotificationTest.

[Miguel Garcia, 2014/07/18 12:27:09]

Done.

+    Profile* profile, ContentSetting setting) {
+  profile->GetHostContentSettingsMap()->SetDefaultContentSetting(
+      CONTENT_SETTINGS_TYPE_NOTIFICATIONS, setting);
+}