Allow resetting Notification permission from the toast's context menu.

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"
@@ skipping 296 matching lines @@
     // WEB_PAGE notifier cannot handle in DesktopNotificationService
     // since it has the exact URL pattern.
     // TODO(mukai): fix this.
     ContentSetting default_setting =
         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)) {
+
+    bool derive_from_default_value =

[dewittj, 2015/04/27 16:48:51]

nit: derive isn't completely clear here..  Possibly differs_from_default_value? 
Or maybe the name would be clearer with a comment block explaining the logic
here. I think that this is saying: We are checking to see if we are supposed to
change a setting or clear it back to the default.

[Peter Beverloo, 2015/04/28 12:14:44]

Done.

+        (default_setting != CONTENT_SETTING_ALLOW && enabled) ||
+        (default_setting == CONTENT_SETTING_ALLOW && !enabled);
+
+    if (derive_from_default_value) {
       if (notifier.notifier_id.url.is_valid()) {
         if (enabled)

[dewittj, 2015/04/27 16:48:51]

nit: please add braces to this if/else since they are more than one-liners

[Peter Beverloo, 2015/04/28 12:14:45]

Done.

           DesktopNotificationProfileUtil::GrantPermission(
               profile, notifier.notifier_id.url);
         else
           DesktopNotificationProfileUtil::DenyPermission(
               profile, notifier.notifier_id.url);
       } else {
         LOG(ERROR) << "Invalid url pattern: "
                    << notifier.notifier_id.url.spec();
       }
     } else {
-      std::map<base::string16, ContentSettingsPattern>::const_iterator iter =
-          patterns_.find(notifier.name);
+      ContentSettingsPattern pattern;
+
+      const auto& iter = patterns_.find(notifier.name);
       if (iter != patterns_.end()) {
-        DesktopNotificationProfileUtil::ClearSetting(profile, iter->second);
+        pattern = iter->second;
+      } else if (notifier.notifier_id.url.is_valid()) {
+        pattern =
+            ContentSettingsPattern::FromURLNoWildcard(notifier.notifier_id.url);
       } else {
         LOG(ERROR) << "Invalid url pattern: "
                    << notifier.notifier_id.url.spec();
       }
+
+      if (pattern.IsValid())
+        DesktopNotificationProfileUtil::ClearSetting(profile, pattern);
     }
   } else {
     notification_service->SetNotifierEnabled(notifier.notifier_id, enabled);
   }
   FOR_EACH_OBSERVER(message_center::NotifierSettingsObserver,
                     observers_,
                     NotifierEnabledChanged(notifier.notifier_id, enabled));
 }
 
 void MessageCenterSettingsController::OnNotifierSettingsClosing() {
@@ skipping 184 matching lines @@
             weak_factory_.GetWeakPtr()));
   }
 #endif
 
   if (notify) {
     FOR_EACH_OBSERVER(message_center::NotifierSettingsObserver,
                       observers_,
                       NotifierGroupChanged());
   }
 }