chrome/browser/web_resource/notification_promo.cc - Issue 11741003: Remove PrefServiceSimple, replacing it with PrefService and PrefRegistrySimple.

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/web_resource/notification_promo.cc

Issue 11741003: Remove PrefServiceSimple, replacing it with PrefService and PrefRegistrySimple. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Address review comments. Fix Clang build and fix bug shown by trybots. Created 7 years, 11 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

« chrome/browser/upgrade_detector.cc ('K') | « chrome/browser/web_resource/notification_promo.h ('k') | chrome/browser/web_resource/plugins_resource_service.h » ('j') | chrome/browser/web_resource/promo_resource_service.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/web_resource/notification_promo.cc

diff --git a/chrome/browser/web_resource/notification_promo.cc b/chrome/browser/web_resource/notification_promo.cc

index 749d5fa370a65a1ba6b6cb82a30ddb5de12a3b24..9913fbb31b15d16933d4d398dc92851ae531986a 100644

--- a/chrome/browser/web_resource/notification_promo.cc

+++ b/chrome/browser/web_resource/notification_promo.cc

@@ -16,8 +16,8 @@

#include "base/time.h"

#include "base/values.h"

#include "chrome/browser/browser_process.h"

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

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

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

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

#include "chrome/browser/web_resource/promo_resource_service.h"

#include "chrome/common/chrome_version_info.h"

@@ -310,8 +310,8 @@ void NotificationPromo::OnNewNotification() {

}

// static

-void NotificationPromo::RegisterPrefs(PrefServiceSimple* local_state) {

- local_state->RegisterDictionaryPref(kPrefPromoObject);

+void NotificationPromo::RegisterPrefs(PrefRegistrySimple* registry) {

+ registry->RegisterDictionaryPref(kPrefPromoObject);

}

// static