chrome/browser/chromeos/status/data_promo_notification.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/chromeos/status/data_promo_notification.cc

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

Patch Set: Fix double registration in Chrome Frame test. 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:

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

Download patch

« no previous file with comments | « chrome/browser/chromeos/status/data_promo_notification.h ('k') | chrome/browser/component_updater/recovery_component_installer.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/status/data_promo_notification.cc

diff --git a/chrome/browser/chromeos/status/data_promo_notification.cc b/chrome/browser/chromeos/status/data_promo_notification.cc

index bfbad93acda0ccfdb176745252e11c46e9a9a7fc..989aea8538f1b93541358e9a056b57d2f22e5c0e 100644

--- a/chrome/browser/chromeos/status/data_promo_notification.cc

+++ b/chrome/browser/chromeos/status/data_promo_notification.cc

@@ -16,6 +16,7 @@

#include "chrome/browser/chromeos/login/helper.h"

#include "chrome/browser/chromeos/login/user_manager.h"

#include "chrome/browser/chromeos/mobile_config.h"

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

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

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

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

@@ -127,9 +128,9 @@ DataPromoNotification::~DataPromoNotification() {

CloseNotification();

}

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

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

// Carrier deal notification shown count defaults to 0.

- local_state->RegisterIntegerPref(prefs::kCarrierDealPromoShown, 0);

+ registry->RegisterIntegerPref(prefs::kCarrierDealPromoShown, 0);

}

void DataPromoNotification::ShowOptionalMobileDataPromoNotification(