Migrate the notification permission to the new common permission classes.

chrome/browser/notifications/message_center_settings_controller.cc

 // Copyright (c) 2013 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/message_center_settings_controller.h"
 
 #include <algorithm>
 
 #include "base/command_line.h"
 #include "base/i18n/string_compare.h"
 #include "base/message_loop/message_loop_proxy.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/task/cancelable_task_tracker.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chrome_notification_types.h"
+#include "chrome/browser/content_settings/host_content_settings_map.h"
 #include "chrome/browser/extensions/app_icon_loader_impl.h"
 #include "chrome/browser/extensions/extension_util.h"
 #include "chrome/browser/favicon/favicon_service.h"
 #include "chrome/browser/favicon/favicon_service_factory.h"
 #include "chrome/browser/history/history_types.h"
 #include "chrome/browser/notifications/desktop_notification_service.h"
 #include "chrome/browser/notifications/desktop_notification_service_factory.h"
 #include "chrome/browser/notifications/sync_notifier/chrome_notifier_service.h"
 #include "chrome/browser/notifications/sync_notifier/chrome_notifier_service_factory.h"
 #include "chrome/browser/profiles/profile.h"
@@ skipping 277 matching lines @@
 #endif
 
   if (comparator) {
     std::sort(notifiers->begin() + app_count, notifiers->end(), *comparator);
   } else {
     std::sort(notifiers->begin() + app_count, notifiers->end(),
               SimpleCompareNotifiers);
   }
 }
 
 void MessageCenterSettingsController::SetNotifierEnabled(

[Peter Beverloo, 2014/07/10 11:29:39]

The MessageCenterSettingsController is the settings provider for the
MessageCenterNotificationManager, which we use as the UI Manager on the desktop
platforms.

On Android, however, we have the NotificationUIManagerAndroid, since we won't be
using the message center. This means that Android won't actually be able to use
the MessageCenterSettingsController, and that we thus would have to duplicate a
lot of the content setting code.

Would it make sense for the settings controller to live before the abstraction,
e.g. in call-sites of DesktopNotificationService before it delegates to the UI
managers?

[Miguel Garcia, 2014/07/17 17:24:48]

Let's talk about this one offline ok? I think it deserves some design discussion
and goes beyond the scope of this refactor.



On 2014/07/10 11:29:39, Peter Beverloo wrote:

     const Notifier& notifier,
     bool enabled) {
   DCHECK_LT(current_notifier_group_, notifier_groups_.size());
   Profile* profile = notifier_groups_[current_notifier_group_]->profile();
 
   DesktopNotificationService* notification_service =
       DesktopNotificationServiceFactory::GetForProfile(profile);
 
   if (notifier.notifier_id.type == NotifierId::WEB_PAGE) {
     // WEB_PAGE notifier cannot handle in DesktopNotificationService
     // since it has the exact URL pattern.
     // TODO(mukai): fix this.
     ContentSetting default_setting =
-        notification_service->GetDefaultContentSetting(NULL);
+        profile->GetHostContentSettingsMap()->GetDefaultContentSetting(
+            CONTENT_SETTINGS_TYPE_NOTIFICATIONS, NULL);
+
     DCHECK(default_setting == CONTENT_SETTING_ALLOW ||
            default_setting == CONTENT_SETTING_BLOCK ||
            default_setting == CONTENT_SETTING_ASK);
     if ((enabled && default_setting != CONTENT_SETTING_ALLOW) ||
         (!enabled && default_setting == CONTENT_SETTING_ALLOW)) {
       if (notifier.notifier_id.url.is_valid()) {
-        if (enabled)
-          notification_service->GrantPermission(notifier.notifier_id.url);
-        else
-          notification_service->DenyPermission(notifier.notifier_id.url);
+        ContentSettingsPattern primary_pattern =
+            ContentSettingsPattern::FromURLNoWildcard(notifier.notifier_id.url);
+        profile->GetHostContentSettingsMap()->SetContentSetting(
+            primary_pattern,
+            ContentSettingsPattern::Wildcard(),
+            CONTENT_SETTINGS_TYPE_NOTIFICATIONS,
+            NO_RESOURCE_IDENTIFIER,
+            enabled ? CONTENT_SETTING_ALLOW : CONTENT_SETTING_BLOCK);
       } else {
         LOG(ERROR) << "Invalid url pattern: "
                    << notifier.notifier_id.url.spec();
       }
     } else {
       std::map<base::string16, ContentSettingsPattern>::const_iterator iter =
           patterns_.find(notifier.name);
       if (iter != patterns_.end()) {
-        notification_service->ClearSetting(iter->second);
+        profile->GetHostContentSettingsMap()->SetContentSetting(
+            iter->second,
+            ContentSettingsPattern::Wildcard(),
+            CONTENT_SETTINGS_TYPE_NOTIFICATIONS,
+            NO_RESOURCE_IDENTIFIER,
+            CONTENT_SETTING_DEFAULT);
       } else {
         LOG(ERROR) << "Invalid url pattern: "
                    << notifier.notifier_id.url.spec();
       }
     }
   } else {
     notification_service->SetNotifierEnabled(notifier.notifier_id, enabled);
   }
   FOR_EACH_OBSERVER(message_center::NotifierSettingsObserver,
                     observers_,
@@ skipping 165 matching lines @@
     // another creating a primary profile, and causes an infinite loop.
     // Thus, it would be better to delay creating group for guest login.
     base::MessageLoopProxy::current()->PostTask(
         FROM_HERE,
         base::Bind(
             &MessageCenterSettingsController::CreateNotifierGroupForGuestLogin,
             weak_factory_.GetWeakPtr()));
   }
 #endif
 }