Index: webkit/glue/webview_impl.cc |
diff --git a/webkit/glue/webview_impl.cc b/webkit/glue/webview_impl.cc |
index b06556336a3d7e8b77434ebd9b6ca0accd9911f6..2ea497a9c826dc09aabecc7a410879a5cabff320 100644 |
--- a/webkit/glue/webview_impl.cc |
+++ b/webkit/glue/webview_impl.cc |
@@ -1400,25 +1400,25 @@ void WebViewImpl::SetInspectorSettings(const std::wstring& settings) { |
// Set the encoding of the current main frame to the one selected by |
// a user in the encoding menu. |
-void WebViewImpl::SetPageEncoding(const std::wstring& encoding_name) { |
+void WebViewImpl::SetPageEncoding(const std::string& encoding_name) { |
if (!page_.get()) |
return; |
if (!encoding_name.empty()) { |
// only change override encoding, don't change default encoding |
// TODO(brettw) use std::string for encoding names. |
- String new_encoding_name(webkit_glue::StdWStringToString(encoding_name)); |
+ String new_encoding_name(webkit_glue::StdStringToString(encoding_name)); |
page_->mainFrame()->loader()->reloadWithOverrideEncoding(new_encoding_name); |
} |
} |
// Return the canonical encoding name of current main webframe in webview. |
-std::wstring WebViewImpl::GetMainFrameEncodingName() { |
+std::string WebViewImpl::GetMainFrameEncodingName() { |
if (!page_.get()) |
- return std::wstring(); |
+ return std::string(); |
String encoding_name = page_->mainFrame()->loader()->encoding(); |
- return webkit_glue::StringToStdWString(encoding_name); |
+ return webkit_glue::StringToStdString(encoding_name); |
} |
void WebViewImpl::ZoomIn(bool text_only) { |