| Index: chrome/renderer/render_view.cc
|
| diff --git a/chrome/renderer/render_view.cc b/chrome/renderer/render_view.cc
|
| index d67e818a68cd1ecc8449e10675991a6629411234..6dae35bc0440b79de701492ff64fb228f7b6a63c 100644
|
| --- a/chrome/renderer/render_view.cc
|
| +++ b/chrome/renderer/render_view.cc
|
| @@ -1001,7 +1001,7 @@ void RenderView::UpdateTitle(WebFrame* frame, const std::wstring& title) {
|
| }
|
|
|
| void RenderView::UpdateEncoding(WebFrame* frame,
|
| - const std::wstring& encoding_name) {
|
| + const std::string& encoding_name) {
|
| // Only update main frame's encoding_name.
|
| if (webview()->GetMainFrame() == frame &&
|
| last_encoding_name_ != encoding_name) {
|
| @@ -2575,7 +2575,7 @@ void RenderView::OnInsertText(const string16& text) {
|
| frame->insertText(text);
|
| }
|
|
|
| -void RenderView::OnSetPageEncoding(const std::wstring& encoding_name) {
|
| +void RenderView::OnSetPageEncoding(const std::string& encoding_name) {
|
| webview()->SetPageEncoding(encoding_name);
|
| }
|
|
|
|
|