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

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

Issue 2537953003: WebString: makes string16 conversions explicit (part 1: blink, content) (Closed)
Patch Set: fix Created 4 years 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 | « content/renderer/history_serialization.cc ('k') | content/renderer/media/canvas_capture_handler.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/manifest/manifest_parser.cc
diff --git a/content/renderer/manifest/manifest_parser.cc b/content/renderer/manifest/manifest_parser.cc
index 442e0d8e1be88bcc619c213290ded27fa4faf3c9..c492844fae13ec566716b88b90eddbf26b98fbfb 100644
--- a/content/renderer/manifest/manifest_parser.cc
+++ b/content/renderer/manifest/manifest_parser.cc
@@ -136,7 +136,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.");
@@ -266,7 +267,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];
« no previous file with comments | « content/renderer/history_serialization.cc ('k') | content/renderer/media/canvas_capture_handler.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698