net/base/filename_util_internal.cc - Issue 895853003: Update from https://crrev.com/314320

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: net/base/filename_util_internal.cc

Issue 895853003: Update from https://crrev.com/314320 (Closed) Base URL: https://github.com/domokit/mojo.git@master

Patch Set: Created 5 years, 11 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:

Index: net/base/filename_util_internal.cc

diff --git a/net/base/filename_util_internal.cc b/net/base/filename_util_internal.cc

index be9139dfff59b7ffdee0edf4849b25b0c8dddf0e..c77375b40d30afa2d75cda645e40ee37fffd799a 100644

--- a/net/base/filename_util_internal.cc

+++ b/net/base/filename_util_internal.cc

@@ -202,8 +202,8 @@ void EnsureSafeExtension(const std::string& mime_type,

bool FilePathToString16(const base::FilePath& path, base::string16* converted) {

#if defined(OS_WIN)

- return base::WideToUTF16(

- path.value().c_str(), path.value().size(), converted);

+ *converted = path.value();

+ return true;

#elif defined(OS_POSIX)

std::string component8 = path.AsUTF8Unsafe();

return !component8.empty() &&

« no previous file with comments | « net/base/dir_header.html ('k') | net/base/filename_util_unittest.cc » ('j') | no next file with comments »