summaryrefslogtreecommitdiffstats
path: root/content/browser/renderer_host
diff options
context:
space:
mode:
authortorne@chromium.org <torne@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-04-13 12:36:53 +0000
committertorne@chromium.org <torne@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-04-13 12:36:53 +0000
commitdcb72d5ca4b77916d0ecc139f2d5d8aa4461d4a9 (patch)
tree5acdcd312af2248ffd4aba3c264be40d42b550bf /content/browser/renderer_host
parent146cb7d13ce0b53c7516d87e0a08009adb47db55 (diff)
downloadchromium_src-dcb72d5ca4b77916d0ecc139f2d5d8aa4461d4a9.zip
chromium_src-dcb72d5ca4b77916d0ecc139f2d5d8aa4461d4a9.tar.gz
chromium_src-dcb72d5ca4b77916d0ecc139f2d5d8aa4461d4a9.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@81399 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/browser/renderer_host')
-rw-r--r--content/browser/renderer_host/render_message_filter.cc4
1 files changed, 3 insertions, 1 deletions
diff --git a/content/browser/renderer_host/render_message_filter.cc b/content/browser/renderer_host/render_message_filter.cc
index 3009f1b..a7387e5 100644
--- a/content/browser/renderer_host/render_message_filter.cc
+++ b/content/browser/renderer_host/render_message_filter.cc
@@ -19,6 +19,7 @@
#include "chrome/browser/net/chrome_url_request_context.h"
#include "chrome/browser/net/predictor_api.h"
#include "chrome/browser/notifications/desktop_notification_service.h"
+#include "chrome/browser/notifications/desktop_notification_service_factory.h"
#include "chrome/browser/notifications/notifications_prefs_cache.h"
#include "chrome/browser/platform_util.h"
#include "chrome/browser/profiles/profile.h"
@@ -245,7 +246,8 @@ RenderMessageFilter::RenderMessageFilter(
extensions_request_context_(profile->GetRequestContextForExtensions()),
render_widget_helper_(render_widget_helper),
notification_prefs_(
- profile->GetDesktopNotificationService()->prefs_cache()),
+ DesktopNotificationServiceFactory::GetForProfile(profile)->
+ prefs_cache()),
host_zoom_map_(profile->GetHostZoomMap()),
incognito_(profile->IsOffTheRecord()),
webkit_context_(profile->GetWebKitContext()),