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

Unified Diff: chrome/browser/themes/theme_service.cc

Issue 8008003: wstring: remove SplitStringAlongWhitespace for wchar (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix test Created 9 years, 3 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/string_split_unittest.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/themes/theme_service.cc
diff --git a/chrome/browser/themes/theme_service.cc b/chrome/browser/themes/theme_service.cc
index e35558c71b073635792e97c9cabc7486ccc98916..b9ee4e86f5b2fe84e44a1bbd31abaa91ef782b25 100644
--- a/chrome/browser/themes/theme_service.cc
+++ b/chrome/browser/themes/theme_service.cc
@@ -385,23 +385,19 @@ std::string ThemeService::AlignmentToString(int alignment) {
// static
int ThemeService::StringToAlignment(const std::string& alignment) {
- std::vector<std::wstring> split;
- base::SplitStringAlongWhitespace(UTF8ToWide(alignment), &split);
+ std::vector<std::string> split;
+ base::SplitStringAlongWhitespace(alignment, &split);
int alignment_mask = 0;
- for (std::vector<std::wstring>::iterator alignments(split.begin());
- alignments != split.end(); ++alignments) {
- std::string comp = WideToUTF8(*alignments);
- const char* component = comp.c_str();
-
- if (base::strcasecmp(component, kAlignmentTop) == 0)
+ for (std::vector<std::string>::iterator component(split.begin());
+ component != split.end(); ++component) {
+ if (LowerCaseEqualsASCII(*component, kAlignmentTop))
alignment_mask |= ThemeService::ALIGN_TOP;
- else if (base::strcasecmp(component, kAlignmentBottom) == 0)
+ else if (LowerCaseEqualsASCII(*component, kAlignmentBottom))
alignment_mask |= ThemeService::ALIGN_BOTTOM;
-
- if (base::strcasecmp(component, kAlignmentLeft) == 0)
+ else if (LowerCaseEqualsASCII(*component, kAlignmentLeft) == 0)
alignment_mask |= ThemeService::ALIGN_LEFT;
- else if (base::strcasecmp(component, kAlignmentRight) == 0)
+ else if (LowerCaseEqualsASCII(*component, kAlignmentRight) == 0)
alignment_mask |= ThemeService::ALIGN_RIGHT;
}
return alignment_mask;
« no previous file with comments | « base/string_split_unittest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698