Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(4226)

Unified Diff: base/strings/string_util.cc

Issue 1172183002: Move StartsWith[ASCII] to base namespace. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@string_util3
Patch Set: merger Created 5 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « base/strings/string_util.h ('k') | base/test/test_pending_task_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: base/strings/string_util.cc
diff --git a/base/strings/string_util.cc b/base/strings/string_util.cc
index cc7769343b5a592a2d081c89e3203dc82be8f720..c1fc05673b2de00776009c0cc29583b441c55a3f 100644
--- a/base/strings/string_util.cc
+++ b/base/strings/string_util.cc
@@ -482,8 +482,6 @@ bool EqualsASCII(const string16& a, const StringPiece& b) {
return std::equal(b.begin(), b.end(), a.begin());
}
-} // namespace base
-
bool StartsWithASCII(const std::string& str,
const std::string& search,
bool case_sensitive) {
@@ -493,22 +491,19 @@ bool StartsWithASCII(const std::string& str,
return base::strncasecmp(str.c_str(), search.c_str(), search.length()) == 0;
}
-template <typename STR>
-bool StartsWithT(const STR& str, const STR& search, bool case_sensitive) {
+bool StartsWith(const string16& str,
+ const string16& search,
+ bool case_sensitive) {
if (case_sensitive) {
return str.compare(0, search.length(), search) == 0;
- } else {
- if (search.size() > str.size())
- return false;
- return std::equal(search.begin(), search.end(), str.begin(),
- base::CaseInsensitiveCompare<typename STR::value_type>());
}
+ if (search.size() > str.size())
+ return false;
+ return std::equal(search.begin(), search.end(), str.begin(),
+ CaseInsensitiveCompare<char16>());
}
-bool StartsWith(const string16& str, const string16& search,
- bool case_sensitive) {
- return StartsWithT(str, search, case_sensitive);
-}
+} // namespace base
template <typename STR>
bool EndsWithT(const STR& str, const STR& search, bool case_sensitive) {
« no previous file with comments | « base/strings/string_util.h ('k') | base/test/test_pending_task_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698