webkit/glue/webpreferences.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/glue/webpreferences.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/glue/webpreferences.cc

diff --git a/webkit/glue/webpreferences.cc b/webkit/glue/webpreferences.cc

index 785bdbf0e1fdc457e32f1cb4b1aa9c98097ecf05..9b822fa6316dcdf35b91680fbc2d794610d7c096 100644

--- a/webkit/glue/webpreferences.cc

+++ b/webkit/glue/webpreferences.cc

@@ -27,7 +27,7 @@ void WebPreferences::Apply(WebView* web_view) const {

settings->setDefaultFixedFontSize(default_fixed_font_size);

settings->setMinimumFontSize(minimum_font_size);

settings->setMinimumLogicalFontSize(minimum_logical_font_size);

- settings->setDefaultTextEncodingName(WideToUTF16Hack(default_encoding));

+ settings->setDefaultTextEncodingName(ASCIIToUTF16(default_encoding));

settings->setJavaScriptEnabled(javascript_enabled);

settings->setWebSecurityEnabled(web_security_enabled);

settings->setJavaScriptCanOpenWindowsAutomatically(

« no previous file with comments | « webkit/glue/webpreferences.h ('k') | webkit/glue/webview.h » ('j') | no next file with comments »