diff options
Diffstat (limited to 'webkit/glue/webview_impl.cc')
| -rw-r--r-- | webkit/glue/webview_impl.cc | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/webkit/glue/webview_impl.cc b/webkit/glue/webview_impl.cc index 5b012db..5c0b490 100644 --- a/webkit/glue/webview_impl.cc +++ b/webkit/glue/webview_impl.cc @@ -35,6 +35,7 @@ #pragma warning(push, 0) #include "Cursor.h" #include "Document.h" +#include "DocumentLoader.h" #include "DragController.h" #include "DragData.h" #include "Editor.h" @@ -1143,7 +1144,7 @@ const WebPreferences& WebViewImpl::GetPreferences() { // Set the encoding of the current main frame to the one selected by // a user in the encoding menu. -void WebViewImpl::SetPageEncoding(const std::string& encoding_name) { +void WebViewImpl::SetPageEncoding(const std::wstring& encoding_name) { if (!main_frame_) return; @@ -1155,12 +1156,12 @@ void WebViewImpl::SetPageEncoding(const std::string& encoding_name) { } // Return the canonical encoding name of current main webframe in webview. -std::string WebViewImpl::GetMainFrameEncodingName() { +std::wstring WebViewImpl::GetMainFrameEncodingName() { if (!main_frame_) - return std::string(); + return std::wstring(L""); String encoding_name = main_frame_->frame()->loader()->encoding(); - return WideToUTF8(webkit_glue::StringToStdWString(encoding_name)); + return std::wstring(encoding_name.charactersWithNullTermination()); } void WebViewImpl::MakeTextLarger() { |