summaryrefslogtreecommitdiff
path: root/chromium/content/renderer/drop_data_builder.cc
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@qt.io>2020-10-12 14:27:29 +0200
committerAllan Sandfeld Jensen <allan.jensen@qt.io>2020-10-13 09:35:20 +0000
commitc30a6232df03e1efbd9f3b226777b07e087a1122 (patch)
treee992f45784689f373bcc38d1b79a239ebe17ee23 /chromium/content/renderer/drop_data_builder.cc
parent7b5b123ac58f58ffde0f4f6e488bcd09aa4decd3 (diff)
downloadqtwebengine-chromium-85-based.tar.gz
BASELINE: Update Chromium to 85.0.4183.14085-based
Change-Id: Iaa42f4680837c57725b1344f108c0196741f6057 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'chromium/content/renderer/drop_data_builder.cc')
-rw-r--r--chromium/content/renderer/drop_data_builder.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/chromium/content/renderer/drop_data_builder.cc b/chromium/content/renderer/drop_data_builder.cc
index ad2fa8df394..f844da3b2cb 100644
--- a/chromium/content/renderer/drop_data_builder.cc
+++ b/chromium/content/renderer/drop_data_builder.cc
@@ -32,7 +32,7 @@ DropData DropDataBuilder::Build(const WebDragData& drag_data) {
case WebDragData::Item::kStorageTypeString: {
base::string16 str_type(item.string_type.Utf16());
if (base::EqualsASCII(str_type, ui::kMimeTypeText)) {
- result.text = WebString::ToNullableString16(item.string_data);
+ result.text = WebString::ToOptionalString16(item.string_data);
break;
}
if (base::EqualsASCII(str_type, ui::kMimeTypeURIList)) {
@@ -45,7 +45,7 @@ DropData DropDataBuilder::Build(const WebDragData& drag_data) {
break;
}
if (base::EqualsASCII(str_type, ui::kMimeTypeHTML)) {
- result.html = WebString::ToNullableString16(item.string_data);
+ result.html = WebString::ToOptionalString16(item.string_data);
result.html_base_url = item.base_url;
break;
}