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/chromeos/options/language_config_model.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/chromeos/options/language_config_model.cc')
| -rw-r--r-- | chrome/browser/chromeos/options/language_config_model.cc | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/chrome/browser/chromeos/options/language_config_model.cc b/chrome/browser/chromeos/options/language_config_model.cc index 07c33bb..4b256ba 100644 --- a/chrome/browser/chromeos/options/language_config_model.cc +++ b/chrome/browser/chromeos/options/language_config_model.cc @@ -136,7 +136,7 @@ void LanguageConfigModel::UpdateInputMethodPreferences( // function below uses stable sort, the relateve order of input methods that // belong to the same language (e.g. "mozc" and "xkb:jp::jpn") is maintained. input_method::SortInputMethodIdsByNames(&new_input_method_ids); - preload_engines_.SetValue(UTF8ToWide(JoinString(new_input_method_ids, ','))); + preload_engines_.SetValue(JoinString(new_input_method_ids, ',')); } void LanguageConfigModel::DeactivateInputMethodsFor( @@ -186,11 +186,10 @@ bool LanguageConfigModel::InputMethodIsActivated( void LanguageConfigModel::GetActiveInputMethodIds( std::vector<std::string>* out_input_method_ids) { - const std::wstring value = preload_engines_.GetValue(); + const std::string value = preload_engines_.GetValue(); out_input_method_ids->clear(); - if (!value.empty()) { - SplitString(WideToUTF8(value), ',', out_input_method_ids); - } + if (!value.empty()) + SplitString(value, ',', out_input_method_ids); } void LanguageConfigModel::GetInputMethodIdsFromLanguageCode( |