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" |
(...skipping 72 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
83 SpellcheckService::~SpellcheckService() { | 83 SpellcheckService::~SpellcheckService() { |
84 // Remove pref observers | 84 // Remove pref observers |
85 pref_change_registrar_.RemoveAll(); | 85 pref_change_registrar_.RemoveAll(); |
86 } | 86 } |
87 | 87 |
88 base::WeakPtr<SpellcheckService> SpellcheckService::GetWeakPtr() { | 88 base::WeakPtr<SpellcheckService> SpellcheckService::GetWeakPtr() { |
89 return weak_ptr_factory_.GetWeakPtr(); | 89 return weak_ptr_factory_.GetWeakPtr(); |
90 } | 90 } |
91 | 91 |
92 // static | 92 // static |
93 int SpellcheckService::GetSpellCheckLanguages( | 93 size_t SpellcheckService::GetSpellCheckLanguages( |
94 content::BrowserContext* context, | 94 content::BrowserContext* context, |
95 std::vector<std::string>* languages) { | 95 std::vector<std::string>* languages) { |
96 PrefService* prefs = user_prefs::UserPrefs::Get(context); | 96 PrefService* prefs = user_prefs::UserPrefs::Get(context); |
97 StringPrefMember accept_languages_pref; | 97 StringPrefMember accept_languages_pref; |
98 StringPrefMember dictionary_language_pref; | |
99 accept_languages_pref.Init(prefs::kAcceptLanguages, prefs); | 98 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 | 99 |
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; | 100 std::vector<std::string> accept_languages; |
106 | |
107 #if defined(OS_MACOSX) | 101 #if defined(OS_MACOSX) |
108 if (spellcheck_mac::SpellCheckerAvailable()) | 102 if (spellcheck_mac::SpellCheckerAvailable()) |
109 spellcheck_mac::GetAvailableLanguages(&accept_languages); | 103 spellcheck_mac::GetAvailableLanguages(&accept_languages); |
110 else | 104 else |
111 base::SplitString(accept_languages_pref.GetValue(), ',', &accept_languages); | 105 base::SplitString(accept_languages_pref.GetValue(), ',', &accept_languages); |
112 #else | 106 #else |
113 base::SplitString(accept_languages_pref.GetValue(), ',', &accept_languages); | 107 base::SplitString(accept_languages_pref.GetValue(), ',', &accept_languages); |
114 #endif // !OS_MACOSX | 108 #endif // !OS_MACOSX |
115 | 109 |
116 GetSpellCheckLanguagesFromAcceptLanguages( | 110 *languages = chrome::spellcheck_common::GetDictionaryLanguagesPref(prefs); |
117 accept_languages, dictionary_language, languages); | 111 size_t enabled_spellcheck_languages = languages->size(); |
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 | 112 |
134 for (std::vector<std::string>::const_iterator i = accept_languages.begin(); | 113 for (std::vector<std::string>::const_iterator i = accept_languages.begin(); |
135 i != accept_languages.end(); ++i) { | 114 i != accept_languages.end(); ++i) { |
136 std::string language = | 115 std::string language = |
137 chrome::spellcheck_common::GetCorrespondingSpellCheckLanguage(*i); | 116 chrome::spellcheck_common::GetCorrespondingSpellCheckLanguage(*i); |
138 if (!language.empty() && | 117 if (!language.empty() && |
139 std::find(languages->begin(), languages->end(), language) == | 118 std::find(languages->begin(), languages->end(), language) == |
140 languages->end()) { | 119 languages->end()) { |
141 languages->push_back(language); | 120 languages->push_back(language); |
142 } | 121 } |
143 } | 122 } |
| 123 |
| 124 return enabled_spellcheck_languages; |
144 } | 125 } |
145 | 126 |
146 // static | 127 // static |
147 bool SpellcheckService::SignalStatusEvent( | 128 bool SpellcheckService::SignalStatusEvent( |
148 SpellcheckService::EventType status_type) { | 129 SpellcheckService::EventType status_type) { |
149 DCHECK_CURRENTLY_ON(BrowserThread::UI); | 130 DCHECK_CURRENTLY_ON(BrowserThread::UI); |
150 | 131 |
151 if (!g_status_event) | 132 if (!g_status_event) |
152 return false; | 133 return false; |
153 g_status_type = status_type; | 134 g_status_type = status_type; |
(...skipping 160 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
314 } | 295 } |
315 | 296 |
316 void SpellcheckService::UpdateFeedbackSenderState() { | 297 void SpellcheckService::UpdateFeedbackSenderState() { |
317 if (SpellingServiceClient::IsAvailable( | 298 if (SpellingServiceClient::IsAvailable( |
318 context_, SpellingServiceClient::SPELLCHECK)) { | 299 context_, SpellingServiceClient::SPELLCHECK)) { |
319 feedback_sender_->StartFeedbackCollection(); | 300 feedback_sender_->StartFeedbackCollection(); |
320 } else { | 301 } else { |
321 feedback_sender_->StopFeedbackCollection(); | 302 feedback_sender_->StopFeedbackCollection(); |
322 } | 303 } |
323 } | 304 } |
OLD | NEW |