chrome/browser/prefs/pref_model_associator.cc - Issue 11570009: Split PrefService into PrefService, PrefServiceSimple and 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/prefs/pref_model_associator.cc

Issue 11570009: Split PrefService into PrefService, PrefServiceSimple and PrefServiceSyncable. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Address review comments. Created 8 years 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/extensions/app_notify_channel_setup_unittest.cc ('K') | « chrome/browser/prefs/pref_model_associator.h ('k') | chrome/browser/prefs/pref_notifier_impl_unittest.cc » ('j') | chrome/browser/prefs/pref_service_simple.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/prefs/pref_model_associator.cc

diff --git a/chrome/browser/prefs/pref_model_associator.cc b/chrome/browser/prefs/pref_model_associator.cc

index d994f8a292334f87c0023b3af64d40bbc35a51b8..e767bbfd5b8f9a6f0c4b62b56ca024faf690225b 100644

--- a/chrome/browser/prefs/pref_model_associator.cc

+++ b/chrome/browser/prefs/pref_model_associator.cc

@@ -11,6 +11,7 @@

#include "base/logging.h"

#include "base/utf_string_conversions.h"

#include "base/values.h"

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

#include "chrome/common/chrome_notification_types.h"

#include "chrome/common/pref_names.h"

#include "sync/api/sync_change.h"

@@ -452,7 +453,7 @@ void PrefModelAssociator::ProcessPrefChange(const std::string& name) {

sync_processor_->ProcessSyncChanges(FROM_HERE, changes);

}

-void PrefModelAssociator::SetPrefService(PrefService* pref_service) {

+void PrefModelAssociator::SetPrefService(PrefServiceSyncable* pref_service) {

DCHECK(pref_service_ == NULL);

pref_service_ = pref_service;

}