chrome/browser/notifications/desktop_notification_service.cc - Issue 6813116: Revert 81277 - Profile shouldn't own DesktopNotificationService.DesktopNotificationService is now...

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: chrome/browser/notifications/desktop_notification_service.cc

Issue 6813116: Revert 81277 - Profile shouldn't own DesktopNotificationService.DesktopNotificationService is now... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/

Patch Set: 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:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/notifications/desktop_notification_service.h ('k') | chrome/browser/notifications/desktop_notification_service_factory.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/notifications/desktop_notification_service.cc

===================================================================

--- chrome/browser/notifications/desktop_notification_service.cc (revision 81278)

+++ chrome/browser/notifications/desktop_notification_service.cc (working copy)

@@ -9,7 +9,6 @@

#include "base/utf_string_conversions.h"

#include "chrome/browser/content_settings/content_settings_provider.h"

#include "chrome/browser/extensions/extension_service.h"

-#include "chrome/browser/notifications/desktop_notification_service_factory.h"

#include "chrome/browser/notifications/notification.h"

#include "chrome/browser/notifications/notification_object_proxy.h"

#include "chrome/browser/notifications/notification_ui_manager.h"

@@ -188,16 +187,14 @@

bool NotificationPermissionInfoBarDelegate::Accept() {

UMA_HISTOGRAM_COUNTS("NotificationPermissionRequest.Allowed", 1);

- DesktopNotificationServiceFactory::GetForProfile(profile_)->

- GrantPermission(origin_);

+ profile_->GetDesktopNotificationService()->GrantPermission(origin_);

action_taken_ = true;

return true;

}

bool NotificationPermissionInfoBarDelegate::Cancel() {

UMA_HISTOGRAM_COUNTS("NotificationPermissionRequest.Denied", 1);

- DesktopNotificationServiceFactory::GetForProfile(profile_)->

- DenyPermission(origin_);

+ profile_->GetDesktopNotificationService()->DenyPermission(origin_);

action_taken_ = true;

return true;

}