diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-10-12 14:27:29 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-10-13 09:35:20 +0000 |
| commit | c30a6232df03e1efbd9f3b226777b07e087a1122 (patch) | |
| tree | e992f45784689f373bcc38d1b79a239ebe17ee23 /chromium/content/public/common/drop_data.h | |
| parent | 7b5b123ac58f58ffde0f4f6e488bcd09aa4decd3 (diff) | |
| download | qtwebengine-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/public/common/drop_data.h')
| -rw-r--r-- | chromium/content/public/common/drop_data.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/chromium/content/public/common/drop_data.h b/chromium/content/public/common/drop_data.h index bbd24fa2ae9..e4a2cadfbc6 100644 --- a/chromium/content/public/common/drop_data.h +++ b/chromium/content/public/common/drop_data.h @@ -17,7 +17,7 @@ #include "base/files/file_path.h" #include "base/optional.h" -#include "base/strings/nullable_string16.h" +#include "base/strings/string16.h" #include "content/common/content_export.h" #include "ipc/ipc_message.h" #include "services/network/public/mojom/referrer_policy.mojom.h" @@ -103,12 +103,12 @@ struct CONTENT_EXPORT DropData { std::vector<FileSystemFileInfo> file_system_files; // User is dragging plain text into the webview. - base::NullableString16 text; + base::Optional<base::string16> text; // User is dragging text/html into the webview (e.g., out of Firefox). // |html_base_url| is the URL that the html fragment is taken from (used to // resolve relative links). It's ok for |html_base_url| to be empty. - base::NullableString16 html; + base::Optional<base::string16> html; GURL html_base_url; // User is dragging an image out of the WebView. |