chrome/browser/notifications/desktop_notification_service.cc - Issue 12079097: Introduce PrefRegistrySyncable, simplifying PrefServiceSyncable.

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 12079097: Introduce PrefRegistrySyncable, simplifying PrefServiceSyncable. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Merge to head again; base::File changes conflicted. Created 7 years, 10 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: chrome/browser/notifications/desktop_notification_service.cc

diff --git a/chrome/browser/notifications/desktop_notification_service.cc b/chrome/browser/notifications/desktop_notification_service.cc

index 323f91390bae8e59a99f20249c8d69ad6836f7b4..4f09b19acfb2f3ea7b9c41e4e5179c593d81c76c 100644

--- a/chrome/browser/notifications/desktop_notification_service.cc

+++ b/chrome/browser/notifications/desktop_notification_service.cc

@@ -19,7 +19,7 @@

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

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

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

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

+#include "chrome/browser/prefs/pref_registry_syncable.h"

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

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

#include "chrome/browser/ui/browser.h"

@@ -192,10 +192,11 @@ bool NotificationPermissionInfoBarDelegate::Cancel() {

// DesktopNotificationService -------------------------------------------------

// static

-void DesktopNotificationService::RegisterUserPrefs(PrefServiceSyncable* prefs) {

+void DesktopNotificationService::RegisterUserPrefs(

+ PrefRegistrySyncable* registry) {

#if defined(OS_CHROMEOS) || defined(ENABLE_MESSAGE_CENTER)

- prefs->RegisterListPref(prefs::kMessageCenterDisabledExtensionIds,

- PrefServiceSyncable::SYNCABLE_PREF);

+ registry->RegisterListPref(prefs::kMessageCenterDisabledExtensionIds,

+ PrefRegistrySyncable::SYNCABLE_PREF);

#endif

}