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_service.h" | 5 #include "chrome/browser/spellchecker/spellcheck_service.h" |
6 | 6 |
7 #include "base/logging.h" | 7 #include "base/logging.h" |
8 #include "base/prefs/pref_member.h" | 8 #include "base/prefs/pref_member.h" |
9 #include "base/prefs/pref_service.h" | 9 #include "base/prefs/pref_service.h" |
10 #include "base/strings/string_split.h" | 10 #include "base/strings/string_split.h" |
11 #include "base/supports_user_data.h" | |
11 #include "base/synchronization/waitable_event.h" | 12 #include "base/synchronization/waitable_event.h" |
12 #include "chrome/browser/spellchecker/feedback_sender.h" | 13 #include "chrome/browser/spellchecker/feedback_sender.h" |
13 #include "chrome/browser/spellchecker/spellcheck_factory.h" | 14 #include "chrome/browser/spellchecker/spellcheck_factory.h" |
14 #include "chrome/browser/spellchecker/spellcheck_host_metrics.h" | 15 #include "chrome/browser/spellchecker/spellcheck_host_metrics.h" |
15 #include "chrome/browser/spellchecker/spellcheck_hunspell_dictionary.h" | 16 #include "chrome/browser/spellchecker/spellcheck_hunspell_dictionary.h" |
16 #include "chrome/browser/spellchecker/spellcheck_platform_mac.h" | 17 #include "chrome/browser/spellchecker/spellcheck_platform_mac.h" |
17 #include "chrome/browser/spellchecker/spelling_service_client.h" | 18 #include "chrome/browser/spellchecker/spelling_service_client.h" |
18 #include "chrome/common/pref_names.h" | 19 #include "chrome/common/pref_names.h" |
19 #include "chrome/common/spellcheck_common.h" | 20 #include "chrome/common/spellcheck_common.h" |
20 #include "chrome/common/spellcheck_messages.h" | 21 #include "chrome/common/spellcheck_messages.h" |
(...skipping 15 matching lines...) Expand all Loading... | |
36 SpellcheckService::EventType g_status_type = | 37 SpellcheckService::EventType g_status_type = |
37 SpellcheckService::BDICT_NOTINITIALIZED; | 38 SpellcheckService::BDICT_NOTINITIALIZED; |
38 | 39 |
39 SpellcheckService::SpellcheckService(content::BrowserContext* context) | 40 SpellcheckService::SpellcheckService(content::BrowserContext* context) |
40 : context_(context), | 41 : context_(context), |
41 weak_ptr_factory_(this) { | 42 weak_ptr_factory_(this) { |
42 DCHECK_CURRENTLY_ON(BrowserThread::UI); | 43 DCHECK_CURRENTLY_ON(BrowserThread::UI); |
43 PrefService* prefs = user_prefs::UserPrefs::Get(context); | 44 PrefService* prefs = user_prefs::UserPrefs::Get(context); |
44 pref_change_registrar_.Init(prefs); | 45 pref_change_registrar_.Init(prefs); |
45 | 46 |
47 std::string spellcheck_language; | |
48 if (chrome::spellcheck_common::IsMultilingualSpellcheckEnabled()) { | |
49 std::vector<std::string> dictionary_languages; | |
groby-ooo-7-16
2015/06/24 22:12:23
As said above, please use a list pref. Preferences
Julius
2015/07/06 22:38:53
Done.
| |
50 base::SplitString(prefs->GetString(prefs::kSpellCheckDictionaries), ',', | |
51 &dictionary_languages); | |
52 if (!dictionary_languages.empty()) | |
53 spellcheck_language = dictionary_languages.front(); | |
54 } else { | |
55 spellcheck_language = prefs->GetString(prefs::kSpellCheckDictionary); | |
56 } | |
57 | |
46 std::string language_code; | 58 std::string language_code; |
47 std::string country_code; | 59 std::string country_code; |
48 chrome::spellcheck_common::GetISOLanguageCountryCodeFromLocale( | 60 chrome::spellcheck_common::GetISOLanguageCountryCodeFromLocale( |
49 prefs->GetString(prefs::kSpellCheckDictionary), | 61 spellcheck_language, |
50 &language_code, | 62 &language_code, |
51 &country_code); | 63 &country_code); |
52 feedback_sender_.reset(new spellcheck::FeedbackSender( | 64 feedback_sender_.reset(new spellcheck::FeedbackSender( |
53 context->GetRequestContext(), language_code, country_code)); | 65 context->GetRequestContext(), language_code, country_code)); |
54 | 66 |
55 pref_change_registrar_.Add( | 67 pref_change_registrar_.Add( |
56 prefs::kEnableAutoSpellCorrect, | 68 prefs::kEnableAutoSpellCorrect, |
57 base::Bind(&SpellcheckService::OnEnableAutoSpellCorrectChanged, | 69 base::Bind(&SpellcheckService::OnEnableAutoSpellCorrectChanged, |
58 base::Unretained(this))); | 70 base::Unretained(this))); |
59 pref_change_registrar_.Add( | 71 |
60 prefs::kSpellCheckDictionary, | 72 if (chrome::spellcheck_common::IsMultilingualSpellcheckEnabled()) { |
61 base::Bind(&SpellcheckService::OnSpellCheckDictionaryChanged, | 73 pref_change_registrar_.Add( |
62 base::Unretained(this))); | 74 prefs::kSpellCheckDictionaries, |
63 pref_change_registrar_.Add( | 75 base::Bind(&SpellcheckService::OnSpellCheckDictionaryChanged, |
64 prefs::kSpellCheckUseSpellingService, | 76 base::Unretained(this))); |
65 base::Bind(&SpellcheckService::OnUseSpellingServiceChanged, | 77 } else { |
66 base::Unretained(this))); | 78 pref_change_registrar_.Add( |
79 prefs::kSpellCheckDictionary, | |
80 base::Bind(&SpellcheckService::OnSpellCheckDictionaryChanged, | |
81 base::Unretained(this))); | |
82 pref_change_registrar_.Add( | |
83 prefs::kSpellCheckUseSpellingService, | |
84 base::Bind(&SpellcheckService::OnUseSpellingServiceChanged, | |
85 base::Unretained(this))); | |
86 } | |
87 | |
67 pref_change_registrar_.Add( | 88 pref_change_registrar_.Add( |
68 prefs::kEnableContinuousSpellcheck, | 89 prefs::kEnableContinuousSpellcheck, |
69 base::Bind(&SpellcheckService::InitForAllRenderers, | 90 base::Bind(&SpellcheckService::InitForAllRenderers, |
70 base::Unretained(this))); | 91 base::Unretained(this))); |
71 | 92 |
72 OnSpellCheckDictionaryChanged(); | 93 OnSpellCheckDictionaryChanged(); |
73 | 94 |
74 custom_dictionary_.reset(new SpellcheckCustomDictionary(context_->GetPath())); | 95 custom_dictionary_.reset(new SpellcheckCustomDictionary(context_->GetPath())); |
75 custom_dictionary_->AddObserver(this); | 96 custom_dictionary_->AddObserver(this); |
76 custom_dictionary_->Load(); | 97 custom_dictionary_->Load(); |
77 | 98 |
78 registrar_.Add(this, | 99 registrar_.Add(this, |
79 content::NOTIFICATION_RENDERER_PROCESS_CREATED, | 100 content::NOTIFICATION_RENDERER_PROCESS_CREATED, |
80 content::NotificationService::AllSources()); | 101 content::NotificationService::AllSources()); |
81 } | 102 } |
82 | 103 |
83 SpellcheckService::~SpellcheckService() { | 104 SpellcheckService::~SpellcheckService() { |
84 // Remove pref observers | 105 // Remove pref observers |
85 pref_change_registrar_.RemoveAll(); | 106 pref_change_registrar_.RemoveAll(); |
86 } | 107 } |
87 | 108 |
88 base::WeakPtr<SpellcheckService> SpellcheckService::GetWeakPtr() { | 109 base::WeakPtr<SpellcheckService> SpellcheckService::GetWeakPtr() { |
89 return weak_ptr_factory_.GetWeakPtr(); | 110 return weak_ptr_factory_.GetWeakPtr(); |
90 } | 111 } |
91 | 112 |
92 // static | 113 // static |
93 int SpellcheckService::GetSpellCheckLanguages( | 114 size_t SpellcheckService::GetSpellCheckLanguages( |
94 content::BrowserContext* context, | 115 base::SupportsUserData* context, |
groby-ooo-7-16
2015/06/24 22:12:23
Why move this to SupportsUserData?
Julius
2015/07/06 22:38:53
This makes it easier to test that GetSpellCheckLan
| |
95 std::vector<std::string>* languages) { | 116 std::vector<std::string>* languages) { |
96 PrefService* prefs = user_prefs::UserPrefs::Get(context); | 117 PrefService* prefs = user_prefs::UserPrefs::Get(context); |
97 StringPrefMember accept_languages_pref; | 118 StringPrefMember accept_languages_pref; |
98 StringPrefMember dictionary_language_pref; | |
99 accept_languages_pref.Init(prefs::kAcceptLanguages, prefs); | 119 accept_languages_pref.Init(prefs::kAcceptLanguages, prefs); |
100 dictionary_language_pref.Init(prefs::kSpellCheckDictionary, prefs); | |
101 std::string dictionary_language = dictionary_language_pref.GetValue(); | |
102 | 120 |
103 // Now scan through the list of accept languages, and find possible mappings | |
104 // from this list to the existing list of spell check languages. | |
105 std::vector<std::string> accept_languages; | 121 std::vector<std::string> accept_languages; |
122 base::SplitString(accept_languages_pref.GetValue(), ',', &accept_languages); | |
106 | 123 |
107 #if defined(OS_MACOSX) | 124 *languages = chrome::spellcheck_common::GetDictionaryLanguagesPref(prefs); |
108 if (spellcheck_mac::SpellCheckerAvailable()) | 125 size_t enabled_spellcheck_languages = languages->size(); |
groby-ooo-7-16
2015/06/24 22:12:23
Why are we getting rid of the OSX path?
Julius
2015/07/06 22:38:53
This function never actually gets called on OSX.
| |
109 spellcheck_mac::GetAvailableLanguages(&accept_languages); | |
110 else | |
111 base::SplitString(accept_languages_pref.GetValue(), ',', &accept_languages); | |
112 #else | |
113 base::SplitString(accept_languages_pref.GetValue(), ',', &accept_languages); | |
114 #endif // !OS_MACOSX | |
115 | |
116 GetSpellCheckLanguagesFromAcceptLanguages( | |
117 accept_languages, dictionary_language, languages); | |
118 | |
119 for (size_t i = 0; i < languages->size(); ++i) { | |
120 if ((*languages)[i] == dictionary_language) | |
121 return i; | |
122 } | |
123 return -1; | |
124 } | |
125 | |
126 // static | |
127 void SpellcheckService::GetSpellCheckLanguagesFromAcceptLanguages( | |
128 const std::vector<std::string>& accept_languages, | |
129 const std::string& dictionary_language, | |
130 std::vector<std::string>* languages) { | |
131 // The current dictionary language should be there. | |
132 languages->push_back(dictionary_language); | |
133 | 126 |
134 for (std::vector<std::string>::const_iterator i = accept_languages.begin(); | 127 for (std::vector<std::string>::const_iterator i = accept_languages.begin(); |
135 i != accept_languages.end(); ++i) { | 128 i != accept_languages.end(); ++i) { |
136 std::string language = | 129 std::string language = |
137 chrome::spellcheck_common::GetCorrespondingSpellCheckLanguage(*i); | 130 chrome::spellcheck_common::GetCorrespondingSpellCheckLanguage(*i); |
138 if (!language.empty() && | 131 if (!language.empty() && |
139 std::find(languages->begin(), languages->end(), language) == | 132 std::find(languages->begin(), languages->end(), language) == |
140 languages->end()) { | 133 languages->end()) { |
141 languages->push_back(language); | 134 languages->push_back(language); |
142 } | 135 } |
143 } | 136 } |
137 | |
138 return enabled_spellcheck_languages; | |
144 } | 139 } |
145 | 140 |
146 // static | 141 // static |
147 bool SpellcheckService::SignalStatusEvent( | 142 bool SpellcheckService::SignalStatusEvent( |
148 SpellcheckService::EventType status_type) { | 143 SpellcheckService::EventType status_type) { |
149 DCHECK_CURRENTLY_ON(BrowserThread::UI); | 144 DCHECK_CURRENTLY_ON(BrowserThread::UI); |
150 | 145 |
151 if (!g_status_event) | 146 if (!g_status_event) |
152 return false; | 147 return false; |
153 g_status_type = status_type; | 148 g_status_type = status_type; |
(...skipping 127 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
281 content::RenderProcessHost::AllHostsIterator()); | 276 content::RenderProcessHost::AllHostsIterator()); |
282 !i.IsAtEnd(); i.Advance()) { | 277 !i.IsAtEnd(); i.Advance()) { |
283 content::RenderProcessHost* process = i.GetCurrentValue(); | 278 content::RenderProcessHost* process = i.GetCurrentValue(); |
284 process->Send(new SpellCheckMsg_EnableAutoSpellCorrect(enabled)); | 279 process->Send(new SpellCheckMsg_EnableAutoSpellCorrect(enabled)); |
285 } | 280 } |
286 } | 281 } |
287 | 282 |
288 void SpellcheckService::OnSpellCheckDictionaryChanged() { | 283 void SpellcheckService::OnSpellCheckDictionaryChanged() { |
289 if (hunspell_dictionary_.get()) | 284 if (hunspell_dictionary_.get()) |
290 hunspell_dictionary_->RemoveObserver(this); | 285 hunspell_dictionary_->RemoveObserver(this); |
291 PrefService* prefs = user_prefs::UserPrefs::Get(context_); | |
292 DCHECK(prefs); | |
293 | 286 |
294 std::string dictionary = | 287 std::string dictionary; |
295 prefs->GetString(prefs::kSpellCheckDictionary); | 288 if (chrome::spellcheck_common::IsMultilingualSpellcheckEnabled()) { |
groby-ooo-7-16
2015/06/24 22:12:23
If we migrated prefs, that would turn into a singl
Julius
2015/07/06 22:38:53
Acknowledged.
| |
289 std::vector<std::string> languages; | |
290 size_t dictionary_languages = GetSpellCheckLanguages(context_, &languages); | |
291 if (dictionary_languages > 0) { | |
292 DCHECK(!languages.empty()); | |
293 dictionary = languages.front(); | |
294 } | |
295 } else { | |
296 dictionary = user_prefs::UserPrefs::Get(context_) | |
297 ->GetString(prefs::kSpellCheckDictionary); | |
298 } | |
296 hunspell_dictionary_.reset(new SpellcheckHunspellDictionary( | 299 hunspell_dictionary_.reset(new SpellcheckHunspellDictionary( |
297 dictionary, context_->GetRequestContext(), this)); | 300 dictionary, context_->GetRequestContext(), this)); |
298 hunspell_dictionary_->AddObserver(this); | 301 hunspell_dictionary_->AddObserver(this); |
299 hunspell_dictionary_->Load(); | 302 hunspell_dictionary_->Load(); |
300 std::string language_code; | 303 std::string language_code; |
301 std::string country_code; | 304 std::string country_code; |
302 chrome::spellcheck_common::GetISOLanguageCountryCodeFromLocale( | 305 chrome::spellcheck_common::GetISOLanguageCountryCodeFromLocale( |
303 dictionary, &language_code, &country_code); | 306 dictionary, &language_code, &country_code); |
304 feedback_sender_->OnLanguageCountryChange(language_code, country_code); | 307 feedback_sender_->OnLanguageCountryChange(language_code, country_code); |
305 UpdateFeedbackSenderState(); | 308 UpdateFeedbackSenderState(); |
306 } | 309 } |
307 | 310 |
308 void SpellcheckService::OnUseSpellingServiceChanged() { | 311 void SpellcheckService::OnUseSpellingServiceChanged() { |
309 bool enabled = pref_change_registrar_.prefs()->GetBoolean( | 312 bool enabled = pref_change_registrar_.prefs()->GetBoolean( |
310 prefs::kSpellCheckUseSpellingService); | 313 prefs::kSpellCheckUseSpellingService); |
311 if (metrics_) | 314 if (metrics_) |
312 metrics_->RecordSpellingServiceStats(enabled); | 315 metrics_->RecordSpellingServiceStats(enabled); |
313 UpdateFeedbackSenderState(); | 316 UpdateFeedbackSenderState(); |
314 } | 317 } |
315 | 318 |
316 void SpellcheckService::UpdateFeedbackSenderState() { | 319 void SpellcheckService::UpdateFeedbackSenderState() { |
317 if (SpellingServiceClient::IsAvailable( | 320 if (SpellingServiceClient::IsAvailable( |
318 context_, SpellingServiceClient::SPELLCHECK)) { | 321 context_, SpellingServiceClient::SPELLCHECK)) { |
319 feedback_sender_->StartFeedbackCollection(); | 322 feedback_sender_->StartFeedbackCollection(); |
320 } else { | 323 } else { |
321 feedback_sender_->StopFeedbackCollection(); | 324 feedback_sender_->StopFeedbackCollection(); |
322 } | 325 } |
323 } | 326 } |
OLD | NEW |