diff options
| author | brettw@google.com <brettw@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-09-12 23:52:57 +0000 |
|---|---|---|
| committer | brettw@google.com <brettw@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-09-12 23:52:57 +0000 |
| commit | b5ebf905dd987aef012adf476787349e02aed677 (patch) | |
| tree | 223ad59748432080584048a600179a92b25f6aa0 /webkit | |
| parent | 199a9c2e4033ad691656e47fe1393befc4169e95 (diff) | |
| download | chromium_src-b5ebf905dd987aef012adf476787349e02aed677.zip chromium_src-b5ebf905dd987aef012adf476787349e02aed677.tar.gz chromium_src-b5ebf905dd987aef012adf476787349e02aed677.tar.bz2 | |
Fix a Mac compile problem as a result of my recent backout.
Review URL: http://codereview.chromium.org/3032
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@2149 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
| -rw-r--r-- | webkit/glue/webview_impl.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/webkit/glue/webview_impl.cc b/webkit/glue/webview_impl.cc index 5c0b490..f522367 100644 --- a/webkit/glue/webview_impl.cc +++ b/webkit/glue/webview_impl.cc @@ -1150,7 +1150,8 @@ void WebViewImpl::SetPageEncoding(const std::wstring& encoding_name) { if (!encoding_name.empty()) { // only change override encoding, don't change default encoding - String new_encoding_name(encoding_name.data()); + // TODO(brettw) use std::string for encoding names. + String new_encoding_name(webkit_glue::StdWStringToString(encoding_name)); main_frame_->frame()->loader()->reloadAllowingStaleData(new_encoding_name); } } |