diff options
| author | tony@chromium.org <tony@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-09-04 22:23:40 +0000 |
|---|---|---|
| committer | tony@chromium.org <tony@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-09-04 22:23:40 +0000 |
| commit | 41fc0320689c888625b5f13b5540a85590d6f830 (patch) | |
| tree | 121dc85682d85da5eb8ff3ef645985a9bb61d635 /webkit/tools/test_shell | |
| parent | fe2c7f0cb1d2513e357f3c840bb1aa00739aafdf (diff) | |
| download | chromium_src-41fc0320689c888625b5f13b5540a85590d6f830.zip chromium_src-41fc0320689c888625b5f13b5540a85590d6f830.tar.gz chromium_src-41fc0320689c888625b5f13b5540a85590d6f830.tar.bz2 | |
Convert std::wstring encoding names to std::string in a bunch of files.
BUG=8647 (http://crbug.com/8647)
TEST=run unit_tests.exe and ui_tests.exe
Original patch by Thiago Farina <thiago.farina@gmail.com> at
http://codereview.chromium.org/179057/show
Some linux related fixes by me.
Review URL: http://codereview.chromium.org/192017
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@25529 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/tools/test_shell')
| -rw-r--r-- | webkit/tools/test_shell/layout_test_controller.cc | 2 | ||||
| -rw-r--r-- | webkit/tools/test_shell/test_shell.cc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/webkit/tools/test_shell/layout_test_controller.cc b/webkit/tools/test_shell/layout_test_controller.cc index be19c95..fbfda9f 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") diff --git a/webkit/tools/test_shell/test_shell.cc b/webkit/tools/test_shell/test_shell.cc index 317a746..3ebb1bc 100644 --- a/webkit/tools/test_shell/test_shell.cc +++ b/webkit/tools/test_shell/test_shell.cc @@ -402,7 +402,7 @@ void TestShell::ResetWebPreferences() { web_prefs_->fixed_font_family = L"Courier"; web_prefs_->sans_serif_font_family = L"Helvetica"; - web_prefs_->default_encoding = L"ISO-8859-1"; + web_prefs_->default_encoding = "ISO-8859-1"; web_prefs_->default_font_size = 16; web_prefs_->default_fixed_font_size = 13; web_prefs_->minimum_font_size = 1; |