chrome/browser/prefs/pref_model_associator.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/prefs/pref_model_associator.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/prefs/pref_model_associator.cc

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

index e767bbfd5b8f9a6f0c4b62b56ca024faf690225b..dea061d9f992bbb4ae8533ec4453407bdd55380b 100644

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

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

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

#include "base/utf_string_conversions.h"

#include "base/values.h"

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

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

#include "chrome/common/chrome_notification_types.h"

#include "chrome/common/pref_names.h"

#include "sync/api/sync_change.h"

« no previous file with comments | « chrome/browser/prefs/pref_model_associator.h ('k') | chrome/browser/prefs/pref_registry.h » ('j') | no next file with comments »