summaryrefslogtreecommitdiffstats
path: root/webkit/glue/webview_impl.cc
diff options
context:
space:
mode:
authorbrettw@google.com <brettw@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-09-13 02:06:26 +0000
committerbrettw@google.com <brettw@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-09-13 02:06:26 +0000
commit3524f69181aed004a4354f714433f425b45f8082 (patch)
treeb9d7fff20e929ef844a7e30919d78defdd894b24 /webkit/glue/webview_impl.cc
parent220043208469fbc19aaa4aed6ae7f75aabbf95b9 (diff)
downloadchromium_src-3524f69181aed004a4354f714433f425b45f8082.zip
chromium_src-3524f69181aed004a4354f714433f425b45f8082.tar.gz
chromium_src-3524f69181aed004a4354f714433f425b45f8082.tar.bz2
Fix string conversions for Mac build bustage
Review URL: http://codereview.chromium.org/2824 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@2162 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/glue/webview_impl.cc')
-rw-r--r--webkit/glue/webview_impl.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/webkit/glue/webview_impl.cc b/webkit/glue/webview_impl.cc
index f522367..b94da8c2 100644
--- a/webkit/glue/webview_impl.cc
+++ b/webkit/glue/webview_impl.cc
@@ -1162,7 +1162,7 @@ std::wstring WebViewImpl::GetMainFrameEncodingName() {
return std::wstring(L"");
String encoding_name = main_frame_->frame()->loader()->encoding();
- return std::wstring(encoding_name.charactersWithNullTermination());
+ return webkit_glue::StringToStdWString(encoding_name);
}
void WebViewImpl::MakeTextLarger() {