webkit/support/webkit_support.cc - Issue 6246036: FilePath: Remove most of ToWStringHack, adding a LossyDisplayName()

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: webkit/support/webkit_support.cc

Issue 6246036: FilePath: Remove most of ToWStringHack, adding a LossyDisplayName() (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 9 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: webkit/support/webkit_support.cc

diff --git a/webkit/support/webkit_support.cc b/webkit/support/webkit_support.cc

index 2e893f986e4348ec75e600a8883829afdeb45759..c4e40d808a17de6586a1d4b08f63703e73d202ec 100644

--- a/webkit/support/webkit_support.cc

+++ b/webkit/support/webkit_support.cc

@@ -289,8 +289,9 @@ WebKit::WebApplicationCacheHost* CreateApplicationCacheHost(

}

WebKit::WebString GetWebKitRootDir() {

- FilePath path = GetWebKitRootDirFilePath();

- return WebKit::WebString::fromUTF8(WideToUTF8(path.ToWStringHack()).c_str());

+ // In theory you cannot safely convert a path to a string, but this code

+ // is only used by tests.

+ return GetWebKitRootDirFilePath().LossyDisplayName();

}

void SetUpGLBindings(GLBindingPreferences bindingPref) {