summaryrefslogtreecommitdiffstats
path: root/base
diff options
context:
space:
mode:
authorbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-08-07 16:55:42 +0000
committerbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-08-07 16:55:42 +0000
commitcb1f4ac35e1e687925fdf62f7f62140dcd6d4a1d (patch)
tree953168adbbb3a7ff1c069911b764ffbed2369384 /base
parentb7a95ad6f584b029954c3b398993f49f1d69265e (diff)
downloadchromium_src-cb1f4ac35e1e687925fdf62f7f62140dcd6d4a1d.zip
chromium_src-cb1f4ac35e1e687925fdf62f7f62140dcd6d4a1d.tar.gz
chromium_src-cb1f4ac35e1e687925fdf62f7f62140dcd6d4a1d.tar.bz2
Move StringToLowerASCII to base namespace
TBR=sky Review URL: https://codereview.chromium.org/448853002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@288085 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base')
-rw-r--r--base/command_line.cc2
-rw-r--r--base/environment.cc2
-rw-r--r--base/i18n/rtl.cc2
-rw-r--r--base/strings/string_util.h22
4 files changed, 14 insertions, 14 deletions
diff --git a/base/command_line.cc b/base/command_line.cc
index 6e37d6b..ca4af97 100644
--- a/base/command_line.cc
+++ b/base/command_line.cc
@@ -96,7 +96,7 @@ void AppendSwitchesAndArguments(CommandLine& command_line,
// Lowercase switches for backwards compatiblity *on Windows*.
std::string LowerASCIIOnWindows(const std::string& string) {
#if defined(OS_WIN)
- return StringToLowerASCII(string);
+ return base::StringToLowerASCII(string);
#elif defined(OS_POSIX)
return string;
#endif
diff --git a/base/environment.cc b/base/environment.cc
index 280469d..c547730 100644
--- a/base/environment.cc
+++ b/base/environment.cc
@@ -36,7 +36,7 @@ class EnvironmentImpl : public base::Environment {
if (first_char >= 'a' && first_char <= 'z')
alternate_case_var = StringToUpperASCII(std::string(variable_name));
else if (first_char >= 'A' && first_char <= 'Z')
- alternate_case_var = StringToLowerASCII(std::string(variable_name));
+ alternate_case_var = base::StringToLowerASCII(std::string(variable_name));
else
return false;
return GetVarImpl(alternate_case_var.c_str(), result);
diff --git a/base/i18n/rtl.cc b/base/i18n/rtl.cc
index d878c40..392cb13 100644
--- a/base/i18n/rtl.cc
+++ b/base/i18n/rtl.cc
@@ -33,7 +33,7 @@ std::string GetLocaleString(const icu::Locale& locale) {
if (variant != NULL && *variant != '\0') {
std::string variant_str(variant);
- StringToLowerASCII(&variant_str);
+ base::StringToLowerASCII(&variant_str);
result += '@' + variant_str;
}
diff --git a/base/strings/string_util.h b/base/strings/string_util.h
index a573e22..e20bbf0 100644
--- a/base/strings/string_util.h
+++ b/base/strings/string_util.h
@@ -249,21 +249,11 @@ BASE_EXPORT bool IsStringUTF8(const std::string& str);
BASE_EXPORT bool IsStringASCII(const StringPiece& str);
BASE_EXPORT bool IsStringASCII(const string16& str);
-} // namespace base
-
-#if defined(OS_WIN)
-#include "base/strings/string_util_win.h"
-#elif defined(OS_POSIX)
-#include "base/strings/string_util_posix.h"
-#else
-#error Define string operations appropriately for your platform
-#endif
-
// Converts the elements of the given string. This version uses a pointer to
// clearly differentiate it from the non-pointer variant.
template <class str> inline void StringToLowerASCII(str* s) {
for (typename str::iterator i = s->begin(); i != s->end(); ++i)
- *i = base::ToLowerASCII(*i);
+ *i = ToLowerASCII(*i);
}
template <class str> inline str StringToLowerASCII(const str& s) {
@@ -273,6 +263,16 @@ template <class str> inline str StringToLowerASCII(const str& s) {
return output;
}
+} // namespace base
+
+#if defined(OS_WIN)
+#include "base/strings/string_util_win.h"
+#elif defined(OS_POSIX)
+#include "base/strings/string_util_posix.h"
+#else
+#error Define string operations appropriately for your platform
+#endif
+
// Converts the elements of the given string. This version uses a pointer to
// clearly differentiate it from the non-pointer variant.
template <class str> inline void StringToUpperASCII(str* s) {