diff options
| author | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-07 20:43:31 +0000 |
|---|---|---|
| committer | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-07 20:43:31 +0000 |
| commit | 1fc82d9171749533e7028a21c1649697499f6056 (patch) | |
| tree | 969da1146a929433ed8488b5507b16af6df25b59 /chrome/browser/notifications | |
| parent | 01e79d8ddbff216a0a0c63f9cb20912c7bde48e1 (diff) | |
| download | chromium_src-1fc82d9171749533e7028a21c1649697499f6056.zip chromium_src-1fc82d9171749533e7028a21c1649697499f6056.tar.gz chromium_src-1fc82d9171749533e7028a21c1649697499f6056.tar.bz2 | |
Reset the desktop notifications settings to default.
When the user clicks in "Reset to default" button on the Preferences/Options dialog, we should reset
the desktop notifications settings to the default default option, like we already do for the other content settings.
BUG=49656
TEST=see bug.
Review URL: http://codereview.chromium.org/3332007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@58754 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/notifications')
| -rw-r--r-- | chrome/browser/notifications/desktop_notification_service.cc | 7 | ||||
| -rw-r--r-- | chrome/browser/notifications/desktop_notification_service.h | 3 |
2 files changed, 10 insertions, 0 deletions
diff --git a/chrome/browser/notifications/desktop_notification_service.cc b/chrome/browser/notifications/desktop_notification_service.cc index fd95141..a467697 100644 --- a/chrome/browser/notifications/desktop_notification_service.cc +++ b/chrome/browser/notifications/desktop_notification_service.cc @@ -418,6 +418,13 @@ void DesktopNotificationService::SetDefaultContentSetting( // The cache is updated through the notification observer. } +void DesktopNotificationService::ResetToDefaultContentSetting() { + DCHECK(ChromeThread::CurrentlyOn(ChromeThread::UI)); + + PrefService* prefs = profile_->GetPrefs(); + prefs->ClearPref(prefs::kDesktopNotificationDefaultContentSetting); +} + std::vector<GURL> DesktopNotificationService::GetAllowedOrigins() { std::vector<GURL> allowed_origins; PrefService* prefs = profile_->GetPrefs(); diff --git a/chrome/browser/notifications/desktop_notification_service.h b/chrome/browser/notifications/desktop_notification_service.h index 7a1bb0a..d1a4ccc 100644 --- a/chrome/browser/notifications/desktop_notification_service.h +++ b/chrome/browser/notifications/desktop_notification_service.h @@ -87,6 +87,9 @@ class DesktopNotificationService : public NotificationObserver { ContentSetting GetDefaultContentSetting(); void SetDefaultContentSetting(ContentSetting setting); + // NOTE: This should only be called on the UI thread. + void ResetToDefaultContentSetting(); + // Returns all origins that explicitly have been allowed. std::vector<GURL> GetAllowedOrigins(); |