From e6950ae588e6aabe1ae4125eac29707c890bd619 Mon Sep 17 00:00:00 2001 From: finnur Date: Tue, 22 Sep 2015 04:31:06 -0700 Subject: [PATCH] Enable editing of content settings type Notifications. BUG=529503 Review URL: https://codereview.chromium.org/1350713002 Cr-Commit-Position: refs/heads/master@{#350139} --- chrome/browser/resources/options/content_settings_exceptions_area.js | 3 +-- chrome/browser/ui/webui/options/content_settings_handler.cc | 1 - 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/chrome/browser/resources/options/content_settings_exceptions_area.js b/chrome/browser/resources/options/content_settings_exceptions_area.js index 08c2858e81c3..273c130f2182 100644 --- a/chrome/browser/resources/options/content_settings_exceptions_area.js +++ b/chrome/browser/resources/options/content_settings_exceptions_area.js @@ -16,8 +16,7 @@ cr.define('options.contentSettings', function() { */ function IsEditableType(contentType) { // Exceptions of the following lists are not editable for now. - return !(contentType == 'notifications' || - contentType == 'location' || + return !(contentType == 'location' || contentType == 'fullscreen' || contentType == 'media-stream-mic' || contentType == 'media-stream-camera' || diff --git a/chrome/browser/ui/webui/options/content_settings_handler.cc b/chrome/browser/ui/webui/options/content_settings_handler.cc index 08aa66f177c1..bb27b55d0578 100644 --- a/chrome/browser/ui/webui/options/content_settings_handler.cc +++ b/chrome/browser/ui/webui/options/content_settings_handler.cc @@ -1418,7 +1418,6 @@ void ContentSettingsHandler::SetException(const base::ListValue* args) { ContentSettingsType type = ContentSettingsTypeFromGroupName(type_string); if (type == CONTENT_SETTINGS_TYPE_GEOLOCATION || - type == CONTENT_SETTINGS_TYPE_NOTIFICATIONS || type == CONTENT_SETTINGS_TYPE_MEDIASTREAM || type == CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC || type == CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA) { -- 2.11.4.GIT