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 66 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
83 SpellcheckService::~SpellcheckService() { | 85 SpellcheckService::~SpellcheckService() { |
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 size_t SpellcheckService::GetSpellCheckLanguages( |
94 content::BrowserContext* context, | 96 const content::BrowserContext* context, |
95 std::vector<std::string>* languages) { | 97 std::vector<std::string>* languages) { |
96 PrefService* prefs = user_prefs::UserPrefs::Get(context); | 98 PrefService* prefs = |
99 user_prefs::UserPrefs::Get(const_cast<content::BrowserContext*>(context)); | |
please use gerrit instead
2015/06/05 17:50:05
Eh, const_cast like this is bad. Let's remove it a
Julius
2015/06/05 21:38:33
Done.
| |
100 | |
97 StringPrefMember accept_languages_pref; | 101 StringPrefMember accept_languages_pref; |
98 StringPrefMember dictionary_language_pref; | |
99 accept_languages_pref.Init(prefs::kAcceptLanguages, prefs); | 102 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 |
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; | 104 std::vector<std::string> accept_languages; |
106 | |
107 #if defined(OS_MACOSX) | 105 #if defined(OS_MACOSX) |
108 if (spellcheck_mac::SpellCheckerAvailable()) | 106 if (spellcheck_mac::SpellCheckerAvailable()) |
109 spellcheck_mac::GetAvailableLanguages(&accept_languages); | 107 spellcheck_mac::GetAvailableLanguages(&accept_languages); |
110 else | 108 else |
111 base::SplitString(accept_languages_pref.GetValue(), ',', &accept_languages); | 109 base::SplitString(accept_languages_pref.GetValue(), ',', &accept_languages); |
112 #else | 110 #else |
113 base::SplitString(accept_languages_pref.GetValue(), ',', &accept_languages); | 111 base::SplitString(accept_languages_pref.GetValue(), ',', &accept_languages); |
114 #endif // !OS_MACOSX | 112 #endif // !OS_MACOSX |
115 | 113 |
116 GetSpellCheckLanguagesFromAcceptLanguages( | 114 *languages = chrome::spellcheck_common::GetDictionaryLanguagesPref(prefs); |
117 accept_languages, dictionary_language, languages); | 115 size_t dictionary_size = languages->size(); |
please use gerrit instead
2015/06/05 17:50:05
s/dictionary_size/enabled_spellcheck_languages
Do
Julius
2015/06/05 21:38:33
Done.
| |
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); | |
please use gerrit instead
2015/06/05 17:50:05
That's a lovely git diff.
Julius
2015/06/05 21:38:33
Acknowledged.
| |
133 | 116 |
134 for (std::vector<std::string>::const_iterator i = accept_languages.begin(); | 117 for (std::vector<std::string>::const_iterator i = accept_languages.begin(); |
135 i != accept_languages.end(); ++i) { | 118 i != accept_languages.end(); ++i) { |
136 std::string language = | 119 std::string language = |
137 chrome::spellcheck_common::GetCorrespondingSpellCheckLanguage(*i); | 120 chrome::spellcheck_common::GetCorrespondingSpellCheckLanguage(*i); |
138 if (!language.empty() && | 121 if (!language.empty() && |
139 std::find(languages->begin(), languages->end(), language) == | 122 std::find(languages->begin(), languages->end(), language) == |
140 languages->end()) { | 123 languages->end()) { |
141 languages->push_back(language); | 124 languages->push_back(language); |
142 } | 125 } |
143 } | 126 } |
127 | |
128 return dictionary_size; | |
144 } | 129 } |
145 | 130 |
146 // static | 131 // static |
147 bool SpellcheckService::SignalStatusEvent( | 132 bool SpellcheckService::SignalStatusEvent( |
148 SpellcheckService::EventType status_type) { | 133 SpellcheckService::EventType status_type) { |
149 DCHECK_CURRENTLY_ON(BrowserThread::UI); | 134 DCHECK_CURRENTLY_ON(BrowserThread::UI); |
150 | 135 |
151 if (!g_status_event) | 136 if (!g_status_event) |
152 return false; | 137 return false; |
153 g_status_type = status_type; | 138 g_status_type = status_type; |
(...skipping 160 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
314 } | 299 } |
315 | 300 |
316 void SpellcheckService::UpdateFeedbackSenderState() { | 301 void SpellcheckService::UpdateFeedbackSenderState() { |
317 if (SpellingServiceClient::IsAvailable( | 302 if (SpellingServiceClient::IsAvailable( |
318 context_, SpellingServiceClient::SPELLCHECK)) { | 303 context_, SpellingServiceClient::SPELLCHECK)) { |
319 feedback_sender_->StartFeedbackCollection(); | 304 feedback_sender_->StartFeedbackCollection(); |
320 } else { | 305 } else { |
321 feedback_sender_->StopFeedbackCollection(); | 306 feedback_sender_->StopFeedbackCollection(); |
322 } | 307 } |
323 } | 308 } |
OLD | NEW |