Migrate the notification permission to the new common permission classes.

chrome/browser/ui/webui/options/content_settings_handler.cc

 // Copyright (c) 2012 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/ui/webui/options/content_settings_handler.h"
 
 #include <algorithm>
 #include <map>
 #include <vector>
 
@@ skipping 659 matching lines @@
   media_ui_settings.SetString("bubbleText", std::string());
 
   web_ui()->CallJavascriptFunction("ContentSettings.updateMediaUI",
                                    media_ui_settings);
 }
 
 std::string ContentSettingsHandler::GetSettingDefaultFromModel(
     ContentSettingsType type, std::string* provider_id) {
   Profile* profile = Profile::FromWebUI(web_ui());
   ContentSetting default_setting;
-  if (type == CONTENT_SETTINGS_TYPE_NOTIFICATIONS) {
-    default_setting =
-        DesktopNotificationServiceFactory::GetForProfile(profile)->
-            GetDefaultContentSetting(provider_id);
-  } else {
-    default_setting =
-        profile->GetHostContentSettingsMap()->
-            GetDefaultContentSetting(type, provider_id);
-  }
+  default_setting =
+      profile->GetHostContentSettingsMap()->
+      GetDefaultContentSetting(type, provider_id);
 
   return ContentSettingToString(default_setting);
 }
 
 void ContentSettingsHandler::UpdateHandlersEnabledRadios() {
   base::FundamentalValue handlers_enabled(
       GetProtocolHandlerRegistry()->enabled());
 
   web_ui()->CallJavascriptFunction(
       "ContentSettings.updateHandlersEnabledRadios",
@@ skipping 464 matching lines @@
   std::string origin;
   std::string setting;
   bool rv = args->GetString(1, &origin);
   DCHECK(rv);
   rv = args->GetString(2, &setting);
   DCHECK(rv);
   ContentSetting content_setting = ContentSettingFromString(setting);
 
   DCHECK(content_setting == CONTENT_SETTING_ALLOW ||
          content_setting == CONTENT_SETTING_BLOCK);
-  DesktopNotificationServiceFactory::GetForProfile(profile)->
-      ClearSetting(ContentSettingsPattern::FromString(origin));
+  profile->GetHostContentSettingsMap()->SetContentSetting(
+      ContentSettingsPattern::FromString(origin),
+       ContentSettingsPattern::Wildcard(),
+       CONTENT_SETTINGS_TYPE_NOTIFICATIONS,
+       NO_RESOURCE_IDENTIFIER,
+       CONTENT_SETTING_DEFAULT);
 }
 
 void ContentSettingsHandler::RemoveMediaException(const base::ListValue* args) {
   std::string mode;
   bool rv = args->GetString(1, &mode);
   DCHECK(rv);
 
   std::string pattern;
   rv = args->GetString(2, &pattern);
   DCHECK(rv);
@@ skipping 121 matching lines @@
   ContentSettingsType content_type = ContentSettingsTypeFromGroupName(group);
   Profile* profile = Profile::FromWebUI(web_ui());
 
 #if defined(OS_CHROMEOS)
   // ChromeOS special case : in Guest mode settings are opened in Incognito
   // mode, so we need original profile to actually modify settings.
   if (chromeos::UserManager::Get()->IsLoggedInAsGuest())
     profile = profile->GetOriginalProfile();
 #endif
 
-  if (content_type == CONTENT_SETTINGS_TYPE_NOTIFICATIONS) {
-    DesktopNotificationServiceFactory::GetForProfile(profile)->
-        SetDefaultContentSetting(default_setting);
-  } else {
-    HostContentSettingsMap* map = profile->GetHostContentSettingsMap();
-    ApplyWhitelist(content_type, default_setting);
-    map->SetDefaultContentSetting(content_type, default_setting);
-  }
+
+  HostContentSettingsMap* map = profile->GetHostContentSettingsMap();
+  ApplyWhitelist(content_type, default_setting);
+  map->SetDefaultContentSetting(content_type, default_setting);
+
   switch (content_type) {
     case CONTENT_SETTINGS_TYPE_COOKIES:
       content::RecordAction(
           UserMetricsAction("Options_DefaultCookieSettingChanged"));
       break;
     case CONTENT_SETTINGS_TYPE_IMAGES:
       content::RecordAction(
           UserMetricsAction("Options_DefaultImagesSettingChanged"));
       break;
     case CONTENT_SETTINGS_TYPE_JAVASCRIPT:
@@ skipping 236 matching lines @@
 void ContentSettingsHandler::UpdateProtectedContentExceptionsButton() {
   PrefService* prefs = Profile::FromWebUI(web_ui())->GetPrefs();
   // Exceptions apply only when the feature is enabled.
   bool enable_exceptions = prefs->GetBoolean(prefs::kEnableDRM);
   web_ui()->CallJavascriptFunction(
       "ContentSettings.enableProtectedContentExceptions",
       base::FundamentalValue(enable_exceptions));
 }
 
 }  // namespace options