| Index: webkit/glue/webpreferences.h
|
| diff --git a/webkit/glue/webpreferences.h b/webkit/glue/webpreferences.h
|
| index f0ab0bbf34a3604e00b7dbdd71496cfdd1fd3cf8..8c9a6495d118bfae255ab6793e29e8fc6381afbf 100644
|
| --- a/webkit/glue/webpreferences.h
|
| +++ b/webkit/glue/webpreferences.h
|
| @@ -27,7 +27,7 @@ struct WebPreferences {
|
| int default_fixed_font_size;
|
| int minimum_font_size;
|
| int minimum_logical_font_size;
|
| - std::wstring default_encoding;
|
| + std::string default_encoding;
|
| bool javascript_enabled;
|
| bool web_security_enabled;
|
| bool javascript_can_open_windows_automatically;
|
| @@ -68,7 +68,7 @@ struct WebPreferences {
|
| default_fixed_font_size(13),
|
| minimum_font_size(1),
|
| minimum_logical_font_size(6),
|
| - default_encoding(L"ISO-8859-1"),
|
| + default_encoding("ISO-8859-1"),
|
| javascript_enabled(true),
|
| web_security_enabled(true),
|
| javascript_can_open_windows_automatically(true),
|
|
|