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

Unified Diff: content/public/common/window_container_type.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/public/common/color_suggestion.cc ('k') | content/public/test/render_view_test.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/public/common/window_container_type.cc
diff --git a/content/public/common/window_container_type.cc b/content/public/common/window_container_type.cc
index 57291bb8a8d4ec54a4f00b334e11b8a8d603cf2f..265e371ca163224d776904a733f49cb6ec8e73d0 100644
--- a/content/public/common/window_container_type.cc
+++ b/content/public/common/window_container_type.cc
@@ -31,11 +31,14 @@ WindowContainerType WindowFeaturesToContainerType(
bool persistent = false;
for (size_t i = 0; i < window_features.additionalFeatures.size(); ++i) {
- base::string16 feature = window_features.additionalFeatures[i];
- if (base::LowerCaseEqualsASCII(feature, kBackground))
- background = true;
- else if (base::LowerCaseEqualsASCII(feature, kPersistent))
- persistent = true;
+ blink::WebString feature = window_features.additionalFeatures[i];
+ if (feature.containsOnlyASCII()) {
+ std::string featureASCII = feature.ascii();
+ if (base::LowerCaseEqualsASCII(featureASCII, kBackground))
+ background = true;
+ else if (base::LowerCaseEqualsASCII(featureASCII, kPersistent))
+ persistent = true;
+ }
}
if (background) {
« no previous file with comments | « content/public/common/color_suggestion.cc ('k') | content/public/test/render_view_test.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698