chrome/browser/notifications/notification_options_menu_model.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/notification_options_menu_model.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/notification_exceptions_table_model_unittest.cc ('k') | chrome/browser/profiles/profile.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/notifications/notification_options_menu_model.cc

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

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

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

@@ -12,7 +12,6 @@

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

#include "chrome/browser/notifications/balloon_host.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_ui_manager.h"

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

@@ -161,7 +160,7 @@

const GURL& origin = notification.origin_url();

DesktopNotificationService* service =

- DesktopNotificationServiceFactory::GetForProfile(balloon_->profile());

+ balloon_->profile()->GetDesktopNotificationService();

if (origin.SchemeIs(chrome::kExtensionScheme)) {

ExtensionService* ext_service =

balloon_->profile()->GetExtensionService();

@@ -211,7 +210,7 @@

void NotificationOptionsMenuModel::ExecuteCommand(int command_id) {

DesktopNotificationService* service =

- DesktopNotificationServiceFactory::GetForProfile(balloon_->profile());

+ balloon_->profile()->GetDesktopNotificationService();

ExtensionService* ext_service =

balloon_->profile()->GetExtensionService();

const GURL& origin = balloon_->notification().origin_url();

« no previous file with comments | « chrome/browser/notifications/notification_exceptions_table_model_unittest.cc ('k') | chrome/browser/profiles/profile.h » ('j') | no next file with comments »