From 76eb0247d08fa6c503517ec1a0cb8e6566cd39c7 Mon Sep 17 00:00:00 2001 From: "tfarina@chromium.org" Date: Thu, 14 Oct 2010 00:35:36 +0000 Subject: base: Move SplitString functions into the base namespace and update the callers. BUG=None TEST=trybots Review URL: http://codereview.chromium.org/3750001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@62483 0039d316-1c4b-4281-b951-d872f2087c98 --- app/l10n_util.cc | 2 +- app/text_elider.cc | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'app') diff --git a/app/l10n_util.cc b/app/l10n_util.cc index 00e8a61..6b25202 100644 --- a/app/l10n_util.cc +++ b/app/l10n_util.cc @@ -339,7 +339,7 @@ std::string GetSystemLocale() { void SplitAndNormalizeLanguageList(const std::string& env_language, std::vector* result) { std::vector langs; - SplitString(env_language, ':', &langs); + base::SplitString(env_language, ':', &langs); std::vector::iterator i = langs.begin(); for (; i != langs.end(); ++i) { size_t end_pos = i->find_first_of(".@"); diff --git a/app/text_elider.cc b/app/text_elider.cc index 3fdb001..4f7ddfb 100644 --- a/app/text_elider.cc +++ b/app/text_elider.cc @@ -123,7 +123,7 @@ std::wstring ElideUrl(const GURL& url, if (url.SchemeIsFile()) { // Split the path string using ":" std::vector file_path_split; - SplitString(url_path, L':', &file_path_split); + base::SplitString(url_path, L':', &file_path_split); if (file_path_split.size() > 1) { // File is of type "file:///C:/.." url_host.clear(); url_domain.clear(); @@ -164,7 +164,7 @@ std::wstring ElideUrl(const GURL& url, // Parse url_path using '/'. std::vector url_path_elements; - SplitString(url_path, L'/', &url_path_elements); + base::SplitString(url_path, L'/', &url_path_elements); // Get filename - note that for a path ending with / // such as www.google.com/intl/ads/, the file name is ads/. -- cgit v1.1