| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "chrome/browser/spellchecker/spellcheck_factory.h" | 5 #include "chrome/browser/spellchecker/spellcheck_factory.h" |
| 6 | 6 |
| 7 #include "chrome/browser/profiles/incognito_helpers.h" | 7 #include "chrome/browser/profiles/incognito_helpers.h" |
| 8 #include "chrome/browser/spellchecker/spellcheck_service.h" | 8 #include "chrome/browser/spellchecker/spellcheck_service.h" |
| 9 #include "chrome/grit/locale_settings.h" | 9 #include "chrome/grit/locale_settings.h" |
| 10 #include "components/keyed_service/content/browser_context_dependency_manager.h" | 10 #include "components/keyed_service/content/browser_context_dependency_manager.h" |
| (...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 54 KeyedService* SpellcheckServiceFactory::BuildServiceInstanceFor( | 54 KeyedService* SpellcheckServiceFactory::BuildServiceInstanceFor( |
| 55 content::BrowserContext* context) const { | 55 content::BrowserContext* context) const { |
| 56 // Many variables are initialized from the |context| in the SpellcheckService. | 56 // Many variables are initialized from the |context| in the SpellcheckService. |
| 57 SpellcheckService* spellcheck = new SpellcheckService(context); | 57 SpellcheckService* spellcheck = new SpellcheckService(context); |
| 58 | 58 |
| 59 PrefService* prefs = user_prefs::UserPrefs::Get(context); | 59 PrefService* prefs = user_prefs::UserPrefs::Get(context); |
| 60 DCHECK(prefs); | 60 DCHECK(prefs); |
| 61 | 61 |
| 62 // Instantiates Metrics object for spellchecking for use. | 62 // Instantiates Metrics object for spellchecking for use. |
| 63 spellcheck->StartRecordingMetrics( | 63 spellcheck->StartRecordingMetrics( |
| 64 prefs->GetBoolean(spellcheck::prefs::kEnableContinuousSpellcheck)); | 64 prefs->GetBoolean(spellcheck::prefs::kEnableSpellcheck)); |
| 65 | 65 |
| 66 return spellcheck; | 66 return spellcheck; |
| 67 } | 67 } |
| 68 | 68 |
| 69 void SpellcheckServiceFactory::RegisterProfilePrefs( | 69 void SpellcheckServiceFactory::RegisterProfilePrefs( |
| 70 user_prefs::PrefRegistrySyncable* user_prefs) { | 70 user_prefs::PrefRegistrySyncable* user_prefs) { |
| 71 user_prefs->RegisterListPref(spellcheck::prefs::kSpellCheckDictionaries, | 71 user_prefs->RegisterListPref(spellcheck::prefs::kSpellCheckDictionaries, |
| 72 new base::ListValue); | 72 new base::ListValue); |
| 73 // Continue registering kSpellCheckDictionary for preference migration. | 73 // Continue registering kSpellCheckDictionary for preference migration. |
| 74 // TODO(estade): IDS_SPELLCHECK_DICTIONARY should be an ASCII string. | 74 // TODO(estade): IDS_SPELLCHECK_DICTIONARY should be an ASCII string. |
| 75 user_prefs->RegisterStringPref( | 75 user_prefs->RegisterStringPref( |
| 76 spellcheck::prefs::kSpellCheckDictionary, | 76 spellcheck::prefs::kSpellCheckDictionary, |
| 77 l10n_util::GetStringUTF8(IDS_SPELLCHECK_DICTIONARY)); | 77 l10n_util::GetStringUTF8(IDS_SPELLCHECK_DICTIONARY)); |
| 78 user_prefs->RegisterBooleanPref( | 78 user_prefs->RegisterBooleanPref( |
| 79 spellcheck::prefs::kSpellCheckUseSpellingService, false); | 79 spellcheck::prefs::kSpellCheckUseSpellingService, false); |
| 80 #if defined(OS_IOS) || defined(OS_ANDROID) | 80 #if defined(OS_IOS) || defined(OS_ANDROID) |
| 81 uint32_t flags = PrefRegistry::NO_REGISTRATION_FLAGS; | 81 uint32_t flags = PrefRegistry::NO_REGISTRATION_FLAGS; |
| 82 #else | 82 #else |
| 83 uint32_t flags = user_prefs::PrefRegistrySyncable::SYNCABLE_PREF; | 83 uint32_t flags = user_prefs::PrefRegistrySyncable::SYNCABLE_PREF; |
| 84 #endif | 84 #endif |
| 85 user_prefs->RegisterBooleanPref( | 85 user_prefs->RegisterBooleanPref( |
| 86 spellcheck::prefs::kEnableContinuousSpellcheck, true, flags); | 86 spellcheck::prefs::kEnableSpellcheck, true, flags); |
| 87 } | 87 } |
| 88 | 88 |
| 89 content::BrowserContext* SpellcheckServiceFactory::GetBrowserContextToUse( | 89 content::BrowserContext* SpellcheckServiceFactory::GetBrowserContextToUse( |
| 90 content::BrowserContext* context) const { | 90 content::BrowserContext* context) const { |
| 91 return chrome::GetBrowserContextRedirectedInIncognito(context); | 91 return chrome::GetBrowserContextRedirectedInIncognito(context); |
| 92 } | 92 } |
| 93 | 93 |
| 94 bool SpellcheckServiceFactory::ServiceIsNULLWhileTesting() const { | 94 bool SpellcheckServiceFactory::ServiceIsNULLWhileTesting() const { |
| 95 return true; | 95 return true; |
| 96 } | 96 } |
| OLD | NEW |