chrome/browser/spellchecker/spellcheck_factory.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/spellchecker/spellcheck_factory.cc

Issue 12079097: Introduce PrefRegistrySyncable, simplifying PrefServiceSyncable. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Add to PrefRegistrySyncable and PrefServiceSyncable to let sync know of pre-registered prefs. 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

« chrome/browser/profiles/profile_keyed_base_factory.cc ('K') | « chrome/browser/spellchecker/spellcheck_factory.h ('k') | chrome/browser/sync/glue/session_model_associator.cc » ('j') | chrome/browser/sync/invalidations/invalidator_storage.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/spellchecker/spellcheck_factory.cc

diff --git a/chrome/browser/spellchecker/spellcheck_factory.cc b/chrome/browser/spellchecker/spellcheck_factory.cc

index a90b69312fe87e3996646ce180896020bdc3c61a..897c8a4b213c73fa3b204ce580f26326c73fb05b 100644

--- a/chrome/browser/spellchecker/spellcheck_factory.cc

+++ b/chrome/browser/spellchecker/spellcheck_factory.cc

@@ -5,6 +5,7 @@

#include "chrome/browser/spellchecker/spellcheck_factory.h"

#include "chrome/browser/browser_process.h"

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

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

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

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

@@ -46,23 +47,24 @@ ProfileKeyedService* SpellcheckServiceFactory::BuildServiceInstanceFor(

}

void SpellcheckServiceFactory::RegisterUserPrefs(

- PrefServiceSyncable* user_prefs) {

+ PrefRegistrySyncable* user_prefs) {

// TODO(estade): IDS_SPELLCHECK_DICTIONARY should be an ASCII string.

- user_prefs->RegisterLocalizedStringPref(prefs::kSpellCheckDictionary,

- IDS_SPELLCHECK_DICTIONARY,

- PrefServiceSyncable::UNSYNCABLE_PREF);

+ user_prefs->RegisterLocalizedStringPref(

+ prefs::kSpellCheckDictionary,

+ IDS_SPELLCHECK_DICTIONARY,

+ PrefRegistrySyncable::UNSYNCABLE_PREF);

user_prefs->RegisterBooleanPref(prefs::kSpellCheckConfirmDialogShown,

false,

- PrefServiceSyncable::UNSYNCABLE_PREF);

+ PrefRegistrySyncable::UNSYNCABLE_PREF);

user_prefs->RegisterBooleanPref(prefs::kSpellCheckUseSpellingService,

false,

- PrefServiceSyncable::UNSYNCABLE_PREF);

+ PrefRegistrySyncable::UNSYNCABLE_PREF);

user_prefs->RegisterBooleanPref(prefs::kEnableContinuousSpellcheck,

true,

- PrefServiceSyncable::SYNCABLE_PREF);

+ PrefRegistrySyncable::SYNCABLE_PREF);

user_prefs->RegisterBooleanPref(prefs::kEnableAutoSpellCorrect,

false,

- PrefServiceSyncable::SYNCABLE_PREF);

+ PrefRegistrySyncable::SYNCABLE_PREF);

}

bool SpellcheckServiceFactory::ServiceRedirectedInIncognito() const {