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

Unified Diff: chrome/browser/search_engines/template_url_parser.cc

Issue 28281: Get rid of wstring variants of StringToFoo. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 11 years, 10 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
Index: chrome/browser/search_engines/template_url_parser.cc
===================================================================
--- chrome/browser/search_engines/template_url_parser.cc (revision 10641)
+++ chrome/browser/search_engines/template_url_parser.cc (working copy)
@@ -311,9 +311,11 @@
} else if (name == kURLTemplateAttribute) {
template_url = XMLCharToWide(value);
} else if (name == kURLIndexOffsetAttribute) {
- index_offset = std::max(1, StringToInt(XMLCharToWide(value)));
+ index_offset =
+ std::max(1, StringToInt(WideToUTF16Hack(XMLCharToWide(value))));
} else if (name == kURLPageOffsetAttribute) {
- page_offset = std::max(1, StringToInt(XMLCharToWide(value)));
+ page_offset =
+ std::max(1, StringToInt(WideToUTF16Hack(XMLCharToWide(value))));
} else if (name == kParamMethodAttribute) {
is_post = LowerCaseEqualsASCII(XMLCharToString(value), "post");
}
@@ -346,9 +348,9 @@
if (name == kImageTypeAttribute) {
type = XMLCharToWide(value);
} else if (name == kImageWidthAttribute) {
- width = StringToInt(XMLCharToWide(value));
+ width = StringToInt(WideToUTF16Hack(XMLCharToWide(value)));
} else if (name == kImageHeightAttribute) {
- height = StringToInt(XMLCharToWide(value));
+ height = StringToInt(WideToUTF16Hack(XMLCharToWide(value)));
}
attributes += 2;
}
@@ -585,5 +587,3 @@
}
return false;
}
-
-

Powered by Google App Engine
This is Rietveld 408576698