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 <algorithm> | |
8 | |
7 #include "base/logging.h" | 9 #include "base/logging.h" |
8 #include "base/prefs/pref_member.h" | 10 #include "base/prefs/pref_member.h" |
9 #include "base/prefs/pref_service.h" | 11 #include "base/prefs/pref_service.h" |
10 #include "base/strings/string_split.h" | 12 #include "base/strings/string_split.h" |
11 #include "base/synchronization/waitable_event.h" | 13 #include "base/synchronization/waitable_event.h" |
12 #include "chrome/browser/spellchecker/feedback_sender.h" | 14 #include "chrome/browser/spellchecker/feedback_sender.h" |
13 #include "chrome/browser/spellchecker/spellcheck_factory.h" | 15 #include "chrome/browser/spellchecker/spellcheck_factory.h" |
14 #include "chrome/browser/spellchecker/spellcheck_host_metrics.h" | 16 #include "chrome/browser/spellchecker/spellcheck_host_metrics.h" |
15 #include "chrome/browser/spellchecker/spellcheck_hunspell_dictionary.h" | 17 #include "chrome/browser/spellchecker/spellcheck_hunspell_dictionary.h" |
16 #include "chrome/browser/spellchecker/spellcheck_platform_mac.h" | 18 #include "chrome/browser/spellchecker/spellcheck_platform_mac.h" |
(...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
84 // Remove pref observers | 86 // Remove pref observers |
85 pref_change_registrar_.RemoveAll(); | 87 pref_change_registrar_.RemoveAll(); |
86 } | 88 } |
87 | 89 |
88 base::WeakPtr<SpellcheckService> SpellcheckService::GetWeakPtr() { | 90 base::WeakPtr<SpellcheckService> SpellcheckService::GetWeakPtr() { |
89 return weak_ptr_factory_.GetWeakPtr(); | 91 return weak_ptr_factory_.GetWeakPtr(); |
90 } | 92 } |
91 | 93 |
92 // static | 94 // static |
93 int SpellcheckService::GetSpellCheckLanguages( | 95 int SpellcheckService::GetSpellCheckLanguages( |
94 content::BrowserContext* context, | 96 content::BrowserContext* context, |
95 std::vector<std::string>* languages) { | 97 std::vector<std::string>* languages) { |
please use gerrit instead
2015/06/04 19:41:05
Do not increase indent here. Use https://code.goog
Julius
2015/06/05 03:41:12
Done.
| |
96 PrefService* prefs = user_prefs::UserPrefs::Get(context); | 98 PrefService* prefs = user_prefs::UserPrefs::Get(context); |
99 std::vector<std::string> dictionary_languages = | |
please use gerrit instead
2015/06/04 19:41:05
Avoid too many std::vector<std::string> copies by
Julius
2015/06/05 03:41:12
Done.
| |
100 chrome::spellcheck_common::GetDictionaryLanguagesPref(prefs); | |
101 | |
102 std::vector<std::string> accept_languages; | |
please use gerrit instead
2015/06/04 19:41:05
Place |accept_languages| closer to where it's used
Julius
2015/06/05 03:41:12
Done.
| |
97 StringPrefMember accept_languages_pref; | 103 StringPrefMember accept_languages_pref; |
98 StringPrefMember dictionary_language_pref; | |
99 accept_languages_pref.Init(prefs::kAcceptLanguages, prefs); | 104 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 | |
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; | |
106 | 105 |
107 #if defined(OS_MACOSX) | 106 #if defined(OS_MACOSX) |
108 if (spellcheck_mac::SpellCheckerAvailable()) | 107 if (spellcheck_mac::SpellCheckerAvailable()) |
109 spellcheck_mac::GetAvailableLanguages(&accept_languages); | 108 spellcheck_mac::GetAvailableLanguages(&accept_languages); |
110 else | 109 else |
111 base::SplitString(accept_languages_pref.GetValue(), ',', &accept_languages); | 110 base::SplitString(accept_languages_pref.GetValue(), ',', &accept_languages); |
112 #else | 111 #else |
113 base::SplitString(accept_languages_pref.GetValue(), ',', &accept_languages); | 112 base::SplitString(accept_languages_pref.GetValue(), ',', &accept_languages); |
114 #endif // !OS_MACOSX | 113 #endif // !OS_MACOSX |
115 | 114 |
116 GetSpellCheckLanguagesFromAcceptLanguages( | 115 // |languages| will begin with all everything in |dictionary_languages|, |
117 accept_languages, dictionary_language, languages); | 116 // followed by all other |accept_languages| not in |dictionary_languages|. |
please use gerrit instead
2015/06/04 19:41:05
This information is important. Put it in the heade
Julius
2015/06/05 03:41:12
Done.
| |
117 *languages = dictionary_languages; | |
118 GetSpellCheckLanguagesFromAcceptLanguages(accept_languages, languages); | |
118 | 119 |
119 for (size_t i = 0; i < languages->size(); ++i) { | 120 // The |languages| vector begins with the entries from |
120 if ((*languages)[i] == dictionary_language) | 121 // |dictionary_languages|, therefore it is only necessary to know how |
121 return i; | 122 // many of the first elements in |languages| are dictionary languages. |
please use gerrit instead
2015/06/04 19:41:05
This information is important. Put it in the heade
Julius
2015/06/05 03:41:12
Done.
| |
122 } | 123 return dictionary_languages.size(); |
123 return -1; | |
124 } | 124 } |
125 | 125 |
126 // static | 126 // static |
127 void SpellcheckService::GetSpellCheckLanguagesFromAcceptLanguages( | 127 void SpellcheckService::GetSpellCheckLanguagesFromAcceptLanguages( |
128 const std::vector<std::string>& accept_languages, | 128 const std::vector<std::string>& accept_languages, |
129 const std::string& dictionary_language, | |
130 std::vector<std::string>* languages) { | 129 std::vector<std::string>* languages) { |
131 // The current dictionary language should be there. | |
132 languages->push_back(dictionary_language); | |
133 | 130 |
134 for (std::vector<std::string>::const_iterator i = accept_languages.begin(); | 131 for (std::vector<std::string>::const_iterator i = accept_languages.begin(); |
135 i != accept_languages.end(); ++i) { | 132 i != accept_languages.end(); ++i) { |
136 std::string language = | 133 std::string language = |
137 chrome::spellcheck_common::GetCorrespondingSpellCheckLanguage(*i); | 134 chrome::spellcheck_common::GetCorrespondingSpellCheckLanguage(*i); |
138 if (!language.empty() && | 135 if (!language.empty() && |
139 std::find(languages->begin(), languages->end(), language) == | 136 std::find(languages->begin(), languages->end(), language) == |
140 languages->end()) { | 137 languages->end()) { |
141 languages->push_back(language); | 138 languages->push_back(language); |
142 } | 139 } |
143 } | 140 } |
141 | |
please use gerrit instead
2015/06/04 19:41:05
Don't change formatting here.
Julius
2015/06/05 03:41:12
Done.
| |
144 } | 142 } |
145 | |
please use gerrit instead
2015/06/04 19:41:05
Don't change formatting here.
Julius
2015/06/05 03:41:12
Done.
| |
146 // static | 143 // static |
147 bool SpellcheckService::SignalStatusEvent( | 144 bool SpellcheckService::SignalStatusEvent( |
148 SpellcheckService::EventType status_type) { | 145 SpellcheckService::EventType status_type) { |
149 DCHECK_CURRENTLY_ON(BrowserThread::UI); | 146 DCHECK_CURRENTLY_ON(BrowserThread::UI); |
150 | 147 |
151 if (!g_status_event) | 148 if (!g_status_event) |
152 return false; | 149 return false; |
153 g_status_type = status_type; | 150 g_status_type = status_type; |
154 g_status_event->Signal(); | 151 g_status_event->Signal(); |
155 return true; | 152 return true; |
(...skipping 158 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
314 } | 311 } |
315 | 312 |
316 void SpellcheckService::UpdateFeedbackSenderState() { | 313 void SpellcheckService::UpdateFeedbackSenderState() { |
317 if (SpellingServiceClient::IsAvailable( | 314 if (SpellingServiceClient::IsAvailable( |
318 context_, SpellingServiceClient::SPELLCHECK)) { | 315 context_, SpellingServiceClient::SPELLCHECK)) { |
319 feedback_sender_->StartFeedbackCollection(); | 316 feedback_sender_->StartFeedbackCollection(); |
320 } else { | 317 } else { |
321 feedback_sender_->StopFeedbackCollection(); | 318 feedback_sender_->StopFeedbackCollection(); |
322 } | 319 } |
323 } | 320 } |
OLD | NEW |