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 locale; | |
please use gerrit instead
2015/06/23 00:43:05
Rename to spellcheck_language.
Julius
2015/06/24 21:17:59
Done.
| |
46 std::string language_code; | 48 std::string language_code; |
please use gerrit instead
2015/06/23 00:43:06
Move to right above GetISOLanguageCountryCodeFromL
Julius
2015/06/24 21:17:59
Done.
| |
47 std::string country_code; | 49 std::string country_code; |
please use gerrit instead
2015/06/23 00:43:05
Move to right above GetISOLanguageCountryCodeFromL
Julius
2015/06/24 21:17:59
Done.
| |
50 if (chrome::spellcheck_common::IsMultilingualSpellcheckEnabled()) { | |
51 std::vector<std::string> dictionary_languages; | |
52 base::SplitString(prefs->GetString(prefs::kSpellCheckDictionaries), ',', | |
53 &dictionary_languages); | |
54 locale = dictionary_languages[0]; | |
55 } else { | |
56 locale = prefs->GetString(prefs::kSpellCheckDictionary); | |
57 } | |
58 | |
48 chrome::spellcheck_common::GetISOLanguageCountryCodeFromLocale( | 59 chrome::spellcheck_common::GetISOLanguageCountryCodeFromLocale( |
49 prefs->GetString(prefs::kSpellCheckDictionary), | 60 locale, |
50 &language_code, | 61 &language_code, |
51 &country_code); | 62 &country_code); |
52 feedback_sender_.reset(new spellcheck::FeedbackSender( | 63 feedback_sender_.reset(new spellcheck::FeedbackSender( |
53 context->GetRequestContext(), language_code, country_code)); | 64 context->GetRequestContext(), language_code, country_code)); |
54 | 65 |
55 pref_change_registrar_.Add( | 66 pref_change_registrar_.Add( |
56 prefs::kEnableAutoSpellCorrect, | 67 prefs::kEnableAutoSpellCorrect, |
57 base::Bind(&SpellcheckService::OnEnableAutoSpellCorrectChanged, | 68 base::Bind(&SpellcheckService::OnEnableAutoSpellCorrectChanged, |
58 base::Unretained(this))); | 69 base::Unretained(this))); |
59 pref_change_registrar_.Add( | 70 |
60 prefs::kSpellCheckDictionary, | 71 #if !defined(OS_MACOSX) |
61 base::Bind(&SpellcheckService::OnSpellCheckDictionaryChanged, | 72 if (chrome::spellcheck_common::IsMultilingualSpellcheckEnabled()) { |
62 base::Unretained(this))); | 73 pref_change_registrar_.Add( |
63 pref_change_registrar_.Add( | 74 prefs::kSpellCheckDictionaries, |
64 prefs::kSpellCheckUseSpellingService, | 75 base::Bind(&SpellcheckService::OnSpellCheckDictionaryChanged, |
65 base::Bind(&SpellcheckService::OnUseSpellingServiceChanged, | 76 base::Unretained(this))); |
66 base::Unretained(this))); | 77 } else { |
78 pref_change_registrar_.Add( | |
79 prefs::kSpellCheckDictionary, | |
80 base::Bind(&SpellcheckService::OnSpellCheckDictionaryChanged, | |
81 base::Unretained(this))); | |
82 } | |
83 OnSpellCheckDictionaryChanged(); | |
84 #endif | |
please use gerrit instead
2015/06/23 00:43:06
#endif // !defined(OS_MACOSX)
Julius
2015/06/24 21:17:59
Done.
| |
85 if (!chrome::spellcheck_common::IsMultilingualSpellcheckEnabled()) { | |
please use gerrit instead
2015/06/23 00:43:06
Add one empty line after #endif for clarity.
Julius
2015/06/24 21:17:59
Done.
| |
86 pref_change_registrar_.Add( | |
87 prefs::kSpellCheckUseSpellingService, | |
88 base::Bind(&SpellcheckService::OnUseSpellingServiceChanged, | |
89 base::Unretained(this))); | |
90 } | |
please use gerrit instead
2015/06/23 00:43:06
Add one empty line after } for clarity.
Julius
2015/06/24 21:17:59
Done.
| |
67 pref_change_registrar_.Add( | 91 pref_change_registrar_.Add( |
68 prefs::kEnableContinuousSpellcheck, | 92 prefs::kEnableContinuousSpellcheck, |
69 base::Bind(&SpellcheckService::InitForAllRenderers, | 93 base::Bind(&SpellcheckService::InitForAllRenderers, |
70 base::Unretained(this))); | 94 base::Unretained(this))); |
71 | 95 |
72 OnSpellCheckDictionaryChanged(); | |
73 | |
74 custom_dictionary_.reset(new SpellcheckCustomDictionary(context_->GetPath())); | 96 custom_dictionary_.reset(new SpellcheckCustomDictionary(context_->GetPath())); |
75 custom_dictionary_->AddObserver(this); | 97 custom_dictionary_->AddObserver(this); |
76 custom_dictionary_->Load(); | 98 custom_dictionary_->Load(); |
77 | 99 |
78 registrar_.Add(this, | 100 registrar_.Add(this, |
79 content::NOTIFICATION_RENDERER_PROCESS_CREATED, | 101 content::NOTIFICATION_RENDERER_PROCESS_CREATED, |
80 content::NotificationService::AllSources()); | 102 content::NotificationService::AllSources()); |
81 } | 103 } |
82 | 104 |
83 SpellcheckService::~SpellcheckService() { | 105 SpellcheckService::~SpellcheckService() { |
84 // Remove pref observers | 106 // Remove pref observers |
85 pref_change_registrar_.RemoveAll(); | 107 pref_change_registrar_.RemoveAll(); |
86 } | 108 } |
87 | 109 |
88 base::WeakPtr<SpellcheckService> SpellcheckService::GetWeakPtr() { | 110 base::WeakPtr<SpellcheckService> SpellcheckService::GetWeakPtr() { |
89 return weak_ptr_factory_.GetWeakPtr(); | 111 return weak_ptr_factory_.GetWeakPtr(); |
90 } | 112 } |
91 | 113 |
114 #if !defined(OS_MACOSX) | |
92 // static | 115 // static |
93 int SpellcheckService::GetSpellCheckLanguages( | 116 size_t SpellcheckService::GetSpellCheckLanguages( |
94 content::BrowserContext* context, | 117 base::SupportsUserData* context, |
95 std::vector<std::string>* languages) { | 118 std::vector<std::string>* languages) { |
96 PrefService* prefs = user_prefs::UserPrefs::Get(context); | 119 PrefService* prefs = user_prefs::UserPrefs::Get(context); |
97 StringPrefMember accept_languages_pref; | 120 StringPrefMember accept_languages_pref; |
98 StringPrefMember dictionary_language_pref; | |
99 accept_languages_pref.Init(prefs::kAcceptLanguages, prefs); | 121 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 | 122 |
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; | 123 std::vector<std::string> accept_languages; |
124 base::SplitString(accept_languages_pref.GetValue(), ',', &accept_languages); | |
106 | 125 |
107 #if defined(OS_MACOSX) | 126 *languages = chrome::spellcheck_common::GetDictionaryLanguagesPref(prefs); |
108 if (spellcheck_mac::SpellCheckerAvailable()) | 127 size_t enabled_spellcheck_languages = languages->size(); |
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 | 128 |
134 for (std::vector<std::string>::const_iterator i = accept_languages.begin(); | 129 for (std::vector<std::string>::const_iterator i = accept_languages.begin(); |
135 i != accept_languages.end(); ++i) { | 130 i != accept_languages.end(); ++i) { |
136 std::string language = | 131 std::string language = |
137 chrome::spellcheck_common::GetCorrespondingSpellCheckLanguage(*i); | 132 chrome::spellcheck_common::GetCorrespondingSpellCheckLanguage(*i); |
138 if (!language.empty() && | 133 if (!language.empty() && |
139 std::find(languages->begin(), languages->end(), language) == | 134 std::find(languages->begin(), languages->end(), language) == |
140 languages->end()) { | 135 languages->end()) { |
please use gerrit instead
2015/06/23 00:43:06
Did clang-format do this? I keep forgetting.
Julius
2015/06/24 21:17:59
Yeah, clang-format did this.
| |
141 languages->push_back(language); | 136 languages->push_back(language); |
142 } | 137 } |
143 } | 138 } |
139 | |
140 return enabled_spellcheck_languages; | |
144 } | 141 } |
142 #endif // !OS_MACOSX | |
please use gerrit instead
2015/06/23 00:43:06
#endif // !defined(OS_MACOSX)
Julius
2015/06/24 21:17:59
Done.
| |
145 | 143 |
146 // static | 144 // static |
147 bool SpellcheckService::SignalStatusEvent( | 145 bool SpellcheckService::SignalStatusEvent( |
148 SpellcheckService::EventType status_type) { | 146 SpellcheckService::EventType status_type) { |
149 DCHECK_CURRENTLY_ON(BrowserThread::UI); | 147 DCHECK_CURRENTLY_ON(BrowserThread::UI); |
150 | 148 |
151 if (!g_status_event) | 149 if (!g_status_event) |
152 return false; | 150 return false; |
153 g_status_type = status_type; | 151 g_status_type = status_type; |
154 g_status_event->Signal(); | 152 g_status_event->Signal(); |
(...skipping 123 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
278 bool enabled = pref_change_registrar_.prefs()->GetBoolean( | 276 bool enabled = pref_change_registrar_.prefs()->GetBoolean( |
279 prefs::kEnableAutoSpellCorrect); | 277 prefs::kEnableAutoSpellCorrect); |
280 for (content::RenderProcessHost::iterator i( | 278 for (content::RenderProcessHost::iterator i( |
281 content::RenderProcessHost::AllHostsIterator()); | 279 content::RenderProcessHost::AllHostsIterator()); |
282 !i.IsAtEnd(); i.Advance()) { | 280 !i.IsAtEnd(); i.Advance()) { |
283 content::RenderProcessHost* process = i.GetCurrentValue(); | 281 content::RenderProcessHost* process = i.GetCurrentValue(); |
284 process->Send(new SpellCheckMsg_EnableAutoSpellCorrect(enabled)); | 282 process->Send(new SpellCheckMsg_EnableAutoSpellCorrect(enabled)); |
285 } | 283 } |
286 } | 284 } |
287 | 285 |
286 #if !defined(OS_MACOSX) | |
288 void SpellcheckService::OnSpellCheckDictionaryChanged() { | 287 void SpellcheckService::OnSpellCheckDictionaryChanged() { |
289 if (hunspell_dictionary_.get()) | 288 if (hunspell_dictionary_.get()) |
290 hunspell_dictionary_->RemoveObserver(this); | 289 hunspell_dictionary_->RemoveObserver(this); |
291 PrefService* prefs = user_prefs::UserPrefs::Get(context_); | |
292 DCHECK(prefs); | |
293 | 290 |
294 std::string dictionary = | 291 std::string dictionary; |
295 prefs->GetString(prefs::kSpellCheckDictionary); | 292 if (chrome::spellcheck_common::IsMultilingualSpellcheckEnabled()) { |
293 std::vector<std::string> languages; | |
294 size_t dictionary_languages = GetSpellCheckLanguages(context_, &languages); | |
295 if (dictionary_languages <= 0) { | |
please use gerrit instead
2015/06/23 00:43:06
size_t is unsigned, so it cannot be < 0.
http://w
Julius
2015/06/24 21:17:59
Done.
| |
296 return; | |
297 } else { | |
298 dictionary = languages[0]; | |
299 } | |
please use gerrit instead
2015/06/23 00:43:05
Chromium's C++ code usually does not have curlies
Julius
2015/06/24 21:17:59
Done.
| |
300 } else { | |
301 dictionary = user_prefs::UserPrefs::Get(context_) | |
302 ->GetString(prefs::kSpellCheckDictionary); | |
please use gerrit instead
2015/06/23 00:43:06
Is this clang-format's doing?
Julius
2015/06/24 21:17:59
Yep, clang-format.
| |
303 } | |
296 hunspell_dictionary_.reset(new SpellcheckHunspellDictionary( | 304 hunspell_dictionary_.reset(new SpellcheckHunspellDictionary( |
297 dictionary, context_->GetRequestContext(), this)); | 305 dictionary, context_->GetRequestContext(), this)); |
298 hunspell_dictionary_->AddObserver(this); | 306 hunspell_dictionary_->AddObserver(this); |
299 hunspell_dictionary_->Load(); | 307 hunspell_dictionary_->Load(); |
300 std::string language_code; | 308 std::string language_code; |
301 std::string country_code; | 309 std::string country_code; |
302 chrome::spellcheck_common::GetISOLanguageCountryCodeFromLocale( | 310 chrome::spellcheck_common::GetISOLanguageCountryCodeFromLocale( |
303 dictionary, &language_code, &country_code); | 311 dictionary, &language_code, &country_code); |
304 feedback_sender_->OnLanguageCountryChange(language_code, country_code); | 312 feedback_sender_->OnLanguageCountryChange(language_code, country_code); |
305 UpdateFeedbackSenderState(); | 313 UpdateFeedbackSenderState(); |
306 } | 314 } |
315 #endif | |
please use gerrit instead
2015/06/23 00:43:06
#endif // !defined(OS_MACOSX)
Julius
2015/06/24 21:17:59
Done.
| |
307 | 316 |
308 void SpellcheckService::OnUseSpellingServiceChanged() { | 317 void SpellcheckService::OnUseSpellingServiceChanged() { |
309 bool enabled = pref_change_registrar_.prefs()->GetBoolean( | 318 bool enabled = pref_change_registrar_.prefs()->GetBoolean( |
310 prefs::kSpellCheckUseSpellingService); | 319 prefs::kSpellCheckUseSpellingService); |
311 if (metrics_) | 320 if (metrics_) |
312 metrics_->RecordSpellingServiceStats(enabled); | 321 metrics_->RecordSpellingServiceStats(enabled); |
313 UpdateFeedbackSenderState(); | 322 UpdateFeedbackSenderState(); |
314 } | 323 } |
315 | 324 |
316 void SpellcheckService::UpdateFeedbackSenderState() { | 325 void SpellcheckService::UpdateFeedbackSenderState() { |
317 if (SpellingServiceClient::IsAvailable( | 326 if (SpellingServiceClient::IsAvailable( |
318 context_, SpellingServiceClient::SPELLCHECK)) { | 327 context_, SpellingServiceClient::SPELLCHECK)) { |
319 feedback_sender_->StartFeedbackCollection(); | 328 feedback_sender_->StartFeedbackCollection(); |
320 } else { | 329 } else { |
321 feedback_sender_->StopFeedbackCollection(); | 330 feedback_sender_->StopFeedbackCollection(); |
322 } | 331 } |
323 } | 332 } |
OLD | NEW |