| 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 960d1913a2ae0a1c1dbe7d8e7411ee975aca6a7f..ad7c3aad440c68bbee60673c4250b97dd291a60f 100644
|
| --- a/content/browser/renderer_host/render_message_filter.cc
|
| +++ b/content/browser/renderer_host/render_message_filter.cc
|
| @@ -17,8 +17,6 @@
|
| #include "chrome/browser/download/download_util.h"
|
| #include "chrome/browser/extensions/extension_info_map.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"
|
| #include "chrome/common/chrome_switches.h"
|
| @@ -286,9 +284,6 @@ RenderMessageFilter::RenderMessageFilter(
|
| resource_context_(profile->GetResourceContext()),
|
| extensions_request_context_(profile->GetRequestContextForExtensions()),
|
| render_widget_helper_(render_widget_helper),
|
| - notification_prefs_(
|
| - DesktopNotificationServiceFactory::GetForProfile(profile)->
|
| - prefs_cache()),
|
| incognito_(profile->IsOffTheRecord()),
|
| webkit_context_(profile->GetWebKitContext()),
|
| render_process_id_(render_process_id) {
|
| @@ -656,7 +651,8 @@ void RenderMessageFilter::OnCheckNotificationPermission(
|
|
|
| // Fall back to the regular notification preferences, which works on an
|
| // origin basis.
|
| - *result = notification_prefs_->HasPermission(source_url.GetOrigin());
|
| + *result = DesktopNotificationService::HasPermission(profile_,
|
| + source_url.GetOrigin());
|
| }
|
|
|
| void RenderMessageFilter::OnAllocateSharedMemoryBuffer(
|
|
|