chrome/browser/ui/options/options_util.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/ui/options/options_util.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/ui/cocoa/notifications/balloon_controller.mm ('k') | chrome/browser/ui/webui/options/content_settings_handler.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/options/options_util.cc

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

--- chrome/browser/ui/options/options_util.cc (revision 81278)

+++ chrome/browser/ui/options/options_util.cc (working copy)

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

#include "chrome/browser/geolocation/geolocation_content_settings_map.h"

#include "chrome/browser/metrics/metrics_service.h"

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

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

#include "chrome/browser/prefs/pref_service.h"

#include "chrome/browser/profiles/profile.h"

#include "chrome/common/pref_names.h"

@@ -84,8 +83,7 @@

profile->GetHostContentSettingsMap()->ResetToDefaults();

profile->GetGeolocationContentSettingsMap()->ResetToDefault();

profile->GetHostZoomMap()->ResetToDefaults();

- DesktopNotificationServiceFactory::GetForProfile(profile)->

- ResetToDefaultContentSetting();

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

for (size_t i = 0; i < arraysize(kUserPrefs); ++i)

prefs->ClearPref(kUserPrefs[i]);