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

Unified Diff: content/renderer/manifest/manifest_parser.cc

Issue 2656043002: Use explicit WebString conversions in remaining content files (Closed)
Patch Set: build fix Created 3 years, 11 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: content/renderer/manifest/manifest_parser.cc
diff --git a/content/renderer/manifest/manifest_parser.cc b/content/renderer/manifest/manifest_parser.cc
index 4d3f7f79622c4204814c615ed20ada713399f1db..fb957a84d4426c7d6a90958e9acfeda16c8b52a8 100644
--- a/content/renderer/manifest/manifest_parser.cc
+++ b/content/renderer/manifest/manifest_parser.cc
@@ -137,7 +137,8 @@ int64_t ManifestParser::ParseColor(
return Manifest::kInvalidOrMissingColor;
blink::WebColor color;
- if (!blink::WebCSSParser::parseColor(&color, parsed_color.string())) {
+ if (!blink::WebCSSParser::parseColor(
+ &color, blink::WebString::fromUTF16(parsed_color.string()))) {
AddErrorInfo("property '" + key + "' ignored, '" +
base::UTF16ToUTF8(parsed_color.string()) + "' is not a " +
"valid color.");
@@ -267,7 +268,8 @@ std::vector<gfx::Size> ManifestParser::ParseIconSizes(
return sizes;
blink::WebVector<blink::WebSize> web_sizes =
- blink::WebIconSizesParser::parseIconSizes(sizes_str.string());
+ blink::WebIconSizesParser::parseIconSizes(
+ blink::WebString::fromUTF16(sizes_str.string()));
sizes.resize(web_sizes.size());
for (size_t i = 0; i < web_sizes.size(); ++i)
sizes[i] = web_sizes[i];

Powered by Google App Engine
This is Rietveld 408576698