diff options
Diffstat (limited to 'chrome/browser/chromeos')
6 files changed, 8 insertions, 8 deletions
diff --git a/chrome/browser/chromeos/input_method/input_method_util.cc b/chrome/browser/chromeos/input_method/input_method_util.cc index 188dea2..0df1b45 100644 --- a/chrome/browser/chromeos/input_method/input_method_util.cc +++ b/chrome/browser/chromeos/input_method/input_method_util.cc @@ -435,7 +435,7 @@ std::string GetLanguageCodeFromDescriptor( language_code == "zh" || language_code == "pt")) { std::vector<std::string> portions; - SplitString(descriptor.id, ':', &portions); + base::SplitString(descriptor.id, ':', &portions); if (portions.size() >= 2 && !portions[1].empty()) { language_code.append("-"); language_code.append(StringToUpperASCII(portions[1])); @@ -463,7 +463,7 @@ std::string GetKeyboardLayoutName(const std::string& input_method_id) { } std::vector<std::string> splitted_id; - SplitString(input_method_id, ':', &splitted_id); + base::SplitString(input_method_id, ':', &splitted_id); return (splitted_id.size() > 1) ? splitted_id[1] : ""; } diff --git a/chrome/browser/chromeos/login/authenticator.cc b/chrome/browser/chromeos/login/authenticator.cc index 1ca3378a..5287dea 100644 --- a/chrome/browser/chromeos/login/authenticator.cc +++ b/chrome/browser/chromeos/login/authenticator.cc @@ -24,7 +24,7 @@ Authenticator::~Authenticator() {} std::string Authenticator::Canonicalize(const std::string& email_address) { std::vector<std::string> parts; char at = '@'; - SplitString(email_address, at, &parts); + base::SplitString(email_address, at, &parts); DCHECK_EQ(parts.size(), 2U) << "email_address should have only one @"; RemoveChars(parts[0], ".", &parts[0]); if (parts[0].find('+') != std::string::npos) diff --git a/chrome/browser/chromeos/options/language_config_model.cc b/chrome/browser/chromeos/options/language_config_model.cc index 3502c2f..0335fa2 100644 --- a/chrome/browser/chromeos/options/language_config_model.cc +++ b/chrome/browser/chromeos/options/language_config_model.cc @@ -196,7 +196,7 @@ void LanguageConfigModel::GetActiveInputMethodIds( const std::string value = preload_engines_pref_.GetValue(); out_input_method_ids->clear(); if (!value.empty()) - SplitString(value, ',', out_input_method_ids); + base::SplitString(value, ',', out_input_method_ids); } void LanguageConfigModel::GetPreferredLanguageCodes( @@ -204,7 +204,7 @@ void LanguageConfigModel::GetPreferredLanguageCodes( const std::string value = preferred_languages_pref_.GetValue(); out_language_codes->clear(); if (!value.empty()) - SplitString(value, ',', out_language_codes); + base::SplitString(value, ',', out_language_codes); } void LanguageConfigModel::GetInputMethodIdsFromLanguageCode( diff --git a/chrome/browser/chromeos/preferences.cc b/chrome/browser/chromeos/preferences.cc index b9aff33..d23ff9e 100644 --- a/chrome/browser/chromeos/preferences.cc +++ b/chrome/browser/chromeos/preferences.cc @@ -407,7 +407,7 @@ void Preferences::SetLanguageConfigStringListAsCSV(const char* section, std::vector<std::string> split_values; if (!value.empty()) - SplitString(value, ',', &split_values); + base::SplitString(value, ',', &split_values); // We should call the cros API even when |value| is empty, to disable default // config. diff --git a/chrome/browser/chromeos/status/input_method_menu.cc b/chrome/browser/chromeos/status/input_method_menu.cc index 17ef62c..e1411e8 100644 --- a/chrome/browser/chromeos/status/input_method_menu.cc +++ b/chrome/browser/chromeos/status/input_method_menu.cc @@ -570,7 +570,7 @@ std::wstring InputMethodMenu::GetTextForIndicator( // rather than "ZH". if (StartsWithASCII(language_code, "zh-", false)) { std::vector<std::string> portions; - SplitString(language_code, '-', &portions); + base::SplitString(language_code, '-', &portions); if (portions.size() >= 2 && !portions[1].empty()) { language_code = portions[1]; } diff --git a/chrome/browser/chromeos/version_loader.cc b/chrome/browser/chromeos/version_loader.cc index e24b357..b7b9dde 100644 --- a/chrome/browser/chromeos/version_loader.cc +++ b/chrome/browser/chromeos/version_loader.cc @@ -52,7 +52,7 @@ std::string VersionLoader::ParseVersion(const std::string& contents) { // Split the lines and look for the one that starts with kPrefix. The version // file is small, which is why we don't try and be tricky. std::vector<std::string> lines; - SplitString(contents, '\n', &lines); + base::SplitString(contents, '\n', &lines); for (size_t i = 0; i < lines.size(); ++i) { if (StartsWithASCII(lines[i], kPrefix, false)) { std::string version = lines[i].substr(std::string(kPrefix).size()); |