webkit/tools/test_shell/layout_test_controller.cc - Issue 192017: Convert std::wstring encoding names to std::string in a bunch of files.

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/tools/test_shell/layout_test_controller.cc

Issue 192017: Convert std::wstring encoding names to std::string in a bunch of files. (Closed)

Patch Set: mac and linux fixes Created 11 years, 3 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/tools/test_shell/layout_test_controller.cc

diff --git a/webkit/tools/test_shell/layout_test_controller.cc b/webkit/tools/test_shell/layout_test_controller.cc

index be19c9533c590104dec5ffe7ab9c54a0796d7197..fbfda9f6a134dc4e64fbb9ab0a8cef516692465a 100644

--- a/webkit/tools/test_shell/layout_test_controller.cc

+++ b/webkit/tools/test_shell/layout_test_controller.cc

@@ -894,7 +894,7 @@ void LayoutTestController::overridePreference(

else if (key == "WebKitMinimumLogicalFontSize")

preferences->minimum_logical_font_size = CppVariantToInt32(value);

else if (key == "WebKitDefaultTextEncodingName")

- preferences->default_encoding = CppVariantToWstring(value);

+ preferences->default_encoding = value.ToString();

else if (key == "WebKitJavaScriptEnabled")

preferences->javascript_enabled = CppVariantToBool(value);

else if (key == "WebKitWebSecurityEnabled")

« no previous file with comments | « webkit/glue/webview_impl.cc ('k') | webkit/tools/test_shell/test_shell.cc » ('j') | no next file with comments »