content/browser/renderer_host/render_message_filter.cc - Issue 6803012: Profile shouldn't own DesktopNotificationService.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: content/browser/renderer_host/render_message_filter.cc

Issue 6803012: Profile shouldn't own DesktopNotificationService. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Rebase Created 9 years, 8 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: content/browser/renderer_host/render_message_filter.cc

diff --git a/content/browser/renderer_host/render_message_filter.cc b/content/browser/renderer_host/render_message_filter.cc

index 3009f1b03a9203a723d1fac196935d825572d329..a7387e5b190fe8e78820d8f5af64718766db875a 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()),

« no previous file with comments | « chrome/test/testing_profile.cc ('k') | content/browser/tab_contents/tab_contents.cc » ('j') | no next file with comments »