diff options
| author | estade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-29 20:35:19 +0000 |
|---|---|---|
| committer | estade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-29 20:35:19 +0000 |
| commit | ddd231eaa03153f6d04894cceb0b4480755e1277 (patch) | |
| tree | faafed02945c1f8934e6e393ac0c6b094c303cdf /chrome/browser/spellcheck_host.cc | |
| parent | c5e30d8572ffae1e0d4fbb2fff765f9a8cbace77 (diff) | |
| download | chromium_src-ddd231eaa03153f6d04894cceb0b4480755e1277.zip chromium_src-ddd231eaa03153f6d04894cceb0b4480755e1277.tar.gz chromium_src-ddd231eaa03153f6d04894cceb0b4480755e1277.tar.bz2 | |
Change a bunch of string types.
Started out just trying to change PrefService::GetString and ::SetString. This snowballed a little bit. Had to change a bunch of url strings in search_engines/ from wstring to string (some of them may be better off as GURLs, but UTF-8 is a step in the right direction, since that's what GURL uses internally, as well as externally via its setters/getters).
TODO (later patch): things that ask for accepted languages should use std::string, not std::wstring.
BUG=none
TEST=try bots
Review URL: http://codereview.chromium.org/2854015
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@51157 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/spellcheck_host.cc')
| -rw-r--r-- | chrome/browser/spellcheck_host.cc | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/chrome/browser/spellcheck_host.cc b/chrome/browser/spellcheck_host.cc index 1c0b266..7ac1a3f 100644 --- a/chrome/browser/spellcheck_host.cc +++ b/chrome/browser/spellcheck_host.cc @@ -110,8 +110,7 @@ int SpellCheckHost::GetSpellCheckLanguages( NULL); dictionary_language_pref.Init(prefs::kSpellCheckDictionary, profile->GetPrefs(), NULL); - std::string dictionary_language = - WideToASCII(dictionary_language_pref.GetValue()); + std::string dictionary_language = dictionary_language_pref.GetValue(); // The current dictionary language should be there. languages->push_back(dictionary_language); @@ -120,12 +119,11 @@ int SpellCheckHost::GetSpellCheckLanguages( // from this list to the existing list of spell check languages. std::vector<std::string> accept_languages; - if (SpellCheckerPlatform::SpellCheckerAvailable()) { + if (SpellCheckerPlatform::SpellCheckerAvailable()) SpellCheckerPlatform::GetAvailableLanguages(&accept_languages); - } else { - SplitString(WideToASCII(accept_languages_pref.GetValue()), ',', - &accept_languages); - } + else + SplitString(accept_languages_pref.GetValue(), ',', &accept_languages); + for (std::vector<std::string>::const_iterator i = accept_languages.begin(); i != accept_languages.end(); ++i) { std::string language = |