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 103 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
114 | 114 |
115 #if !defined(OS_MACOSX) | 115 #if !defined(OS_MACOSX) |
116 // static | 116 // static |
117 size_t SpellcheckService::GetSpellCheckLanguages( | 117 size_t SpellcheckService::GetSpellCheckLanguages( |
118 base::SupportsUserData* context, | 118 base::SupportsUserData* context, |
119 std::vector<std::string>* languages) { | 119 std::vector<std::string>* languages) { |
120 PrefService* prefs = user_prefs::UserPrefs::Get(context); | 120 PrefService* prefs = user_prefs::UserPrefs::Get(context); |
121 StringPrefMember accept_languages_pref; | 121 StringPrefMember accept_languages_pref; |
122 accept_languages_pref.Init(prefs::kAcceptLanguages, prefs); | 122 accept_languages_pref.Init(prefs::kAcceptLanguages, prefs); |
123 | 123 |
124 std::vector<std::string> accept_languages; | 124 std::vector<std::string> accept_languages = base::SplitString( |
125 base::SplitString(accept_languages_pref.GetValue(), ',', &accept_languages); | 125 accept_languages_pref.GetValue(), ",", |
| 126 base::TRIM_WHITESPACE, base::SPLIT_WANT_ALL); |
126 | 127 |
127 StringListPrefMember dictionaries_pref; | 128 StringListPrefMember dictionaries_pref; |
128 dictionaries_pref.Init(prefs::kSpellCheckDictionaries, prefs); | 129 dictionaries_pref.Init(prefs::kSpellCheckDictionaries, prefs); |
129 *languages = dictionaries_pref.GetValue(); | 130 *languages = dictionaries_pref.GetValue(); |
130 size_t enabled_spellcheck_languages = languages->size(); | 131 size_t enabled_spellcheck_languages = languages->size(); |
131 | 132 |
132 for (std::vector<std::string>::const_iterator i = accept_languages.begin(); | 133 for (std::vector<std::string>::const_iterator i = accept_languages.begin(); |
133 i != accept_languages.end(); ++i) { | 134 i != accept_languages.end(); ++i) { |
134 std::string language = | 135 std::string language = |
135 chrome::spellcheck_common::GetCorrespondingSpellCheckLanguage(*i); | 136 chrome::spellcheck_common::GetCorrespondingSpellCheckLanguage(*i); |
(...skipping 182 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
318 } | 319 } |
319 | 320 |
320 void SpellcheckService::UpdateFeedbackSenderState() { | 321 void SpellcheckService::UpdateFeedbackSenderState() { |
321 if (SpellingServiceClient::IsAvailable( | 322 if (SpellingServiceClient::IsAvailable( |
322 context_, SpellingServiceClient::SPELLCHECK)) { | 323 context_, SpellingServiceClient::SPELLCHECK)) { |
323 feedback_sender_->StartFeedbackCollection(); | 324 feedback_sender_->StartFeedbackCollection(); |
324 } else { | 325 } else { |
325 feedback_sender_->StopFeedbackCollection(); | 326 feedback_sender_->StopFeedbackCollection(); |
326 } | 327 } |
327 } | 328 } |
OLD | NEW |