content/renderer/drop_data_builder.cc - Issue 1686263008: Add utility method for WebString to base::FilePath conversion

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: content/renderer/drop_data_builder.cc

Issue 1686263008: Add utility method for WebString to base::FilePath conversion (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 4 years, 10 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

« no previous file with comments | « content/child/webfileutilities_impl.cc ('k') | content/renderer/pepper/url_response_info_util.cc » ('j') | content/shell/renderer/layout_test/blink_test_runner.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/renderer/drop_data_builder.cc

diff --git a/content/renderer/drop_data_builder.cc b/content/renderer/drop_data_builder.cc

index 232428b5891004d3a4b611335b393707c17966a4..1016bcffe5be0952f51045db52860acc35a5af1a 100644

--- a/content/renderer/drop_data_builder.cc

+++ b/content/renderer/drop_data_builder.cc

@@ -8,6 +8,7 @@

#include "base/strings/string_util.h"

#include "content/public/common/drop_data.h"

+#include "third_party/WebKit/public/platform/FilePathConversion.h"

#include "third_party/WebKit/public/platform/URLConversion.h"

#include "third_party/WebKit/public/platform/WebDragData.h"

#include "third_party/WebKit/public/platform/WebString.h"

@@ -60,8 +61,8 @@ DropData DropDataBuilder::Build(const WebDragData& drag_data) {

case WebDragData::Item::StorageTypeFilename:

// TODO(varunjain): This only works on chromeos. Support win/mac/gtk.

result.filenames.push_back(ui::FileInfo(

- base::FilePath::FromUTF16Unsafe(item.filenameData),

- base::FilePath::FromUTF16Unsafe(item.displayNameData)));

+ blink::WebStringToFilePath(item.filenameData),

+ blink::WebStringToFilePath(item.displayNameData)));

break;

case WebDragData::Item::StorageTypeFileSystemFile: {

DropData::FileSystemFileInfo info;