diff options
author | siggi@chromium.org <siggi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-04-12 19:05:42 +0000 |
---|---|---|
committer | siggi@chromium.org <siggi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-04-12 19:05:42 +0000 |
commit | fc1e52d59a43854f9be84dbe1dd03191c67ebaa3 (patch) | |
tree | b7240d58bca7faa802a5c536c129d89bbe9f7ade /chrome/browser/ui/cocoa/notifications | |
parent | 9c5330953b0d6fb7120395b3b1465a789caf6bf9 (diff) | |
download | chromium_src-fc1e52d59a43854f9be84dbe1dd03191c67ebaa3.zip chromium_src-fc1e52d59a43854f9be84dbe1dd03191c67ebaa3.tar.gz chromium_src-fc1e52d59a43854f9be84dbe1dd03191c67ebaa3.tar.bz2 |
Revert 81277 - Profile shouldn't own DesktopNotificationService.DesktopNotificationService is now owned byDesktopNotificationServiceFactory, using Profile as a key. This uses theProfileKeyedService infrastructure originally created forThemeServiceFactory.BUG=77155TEST=existing testsReview URL: http://codereview.chromium.org/6803012
TBR=torne@chromium.org
Review URL: http://codereview.chromium.org/6813116
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@81280 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/ui/cocoa/notifications')
-rw-r--r-- | chrome/browser/ui/cocoa/notifications/balloon_controller.mm | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/chrome/browser/ui/cocoa/notifications/balloon_controller.mm b/chrome/browser/ui/cocoa/notifications/balloon_controller.mm index dec0b90..094ec95 100644 --- a/chrome/browser/ui/cocoa/notifications/balloon_controller.mm +++ b/chrome/browser/ui/cocoa/notifications/balloon_controller.mm @@ -11,7 +11,6 @@ #include "base/utf_string_conversions.h" #include "chrome/browser/notifications/balloon.h" #include "chrome/browser/notifications/desktop_notification_service.h" -#include "chrome/browser/notifications/desktop_notification_service_factory.h" #include "chrome/browser/notifications/notification.h" #include "chrome/browser/notifications/notification_options_menu_model.h" #include "chrome/browser/profiles/profile.h" @@ -145,7 +144,7 @@ const int kRightMargin = 2; - (IBAction)permissionRevoked:(id)sender { DesktopNotificationService* service = - DesktopNotificationServiceFactory::GetForProfile(balloon_->profile()); + balloon_->profile()->GetDesktopNotificationService(); service->DenyPermission(balloon_->notification().origin_url()); } |