diff options
| author | torne@chromium.org <torne@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-04-12 18:48:17 +0000 |
|---|---|---|
| committer | torne@chromium.org <torne@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-04-12 18:48:17 +0000 |
| commit | 7211f74d2f66c46507e235b39245f736420e68d1 (patch) | |
| tree | ea8f2a932730dd902540f8e9ce2cb79db4b654c8 /chrome/browser/ui/options | |
| parent | 413a8e22c2ff986d335cdc9b86f78a6716a52975 (diff) | |
| download | chromium_src-7211f74d2f66c46507e235b39245f736420e68d1.zip chromium_src-7211f74d2f66c46507e235b39245f736420e68d1.tar.gz chromium_src-7211f74d2f66c46507e235b39245f736420e68d1.tar.bz2 | |
Profile shouldn't own DesktopNotificationService.
DesktopNotificationService is now owned by
DesktopNotificationServiceFactory, using Profile as a key. This uses the
ProfileKeyedService infrastructure originally created for
ThemeServiceFactory.
BUG=77155
TEST=existing tests
Review URL: http://codereview.chromium.org/6803012
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@81277 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/ui/options')
| -rw-r--r-- | chrome/browser/ui/options/options_util.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/chrome/browser/ui/options/options_util.cc b/chrome/browser/ui/options/options_util.cc index 590c093..43cd7dd 100644 --- a/chrome/browser/ui/options/options_util.cc +++ b/chrome/browser/ui/options/options_util.cc @@ -12,6 +12,7 @@ #include "chrome/browser/geolocation/geolocation_content_settings_map.h" #include "chrome/browser/metrics/metrics_service.h" #include "chrome/browser/notifications/desktop_notification_service.h" +#include "chrome/browser/notifications/desktop_notification_service_factory.h" #include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/profile.h" #include "chrome/common/pref_names.h" @@ -83,7 +84,8 @@ void OptionsUtil::ResetToDefaults(Profile* profile) { profile->GetHostContentSettingsMap()->ResetToDefaults(); profile->GetGeolocationContentSettingsMap()->ResetToDefault(); profile->GetHostZoomMap()->ResetToDefaults(); - profile->GetDesktopNotificationService()->ResetToDefaultContentSetting(); + DesktopNotificationServiceFactory::GetForProfile(profile)-> + ResetToDefaultContentSetting(); for (size_t i = 0; i < arraysize(kUserPrefs); ++i) prefs->ClearPref(kUserPrefs[i]); |