| Index: chrome/browser/tab_contents/tab_contents.cc
|
| diff --git a/chrome/browser/tab_contents/tab_contents.cc b/chrome/browser/tab_contents/tab_contents.cc
|
| index 083296c37f5f1d29a77cb867233181607590e9f9..b6c2cc7bee43a19870e2a93dc8a4cafa2bd0a22a 100644
|
| --- a/chrome/browser/tab_contents/tab_contents.cc
|
| +++ b/chrome/browser/tab_contents/tab_contents.cc
|
| @@ -2008,7 +2008,7 @@ void TabContents::UpdateTitle(RenderViewHost* rvh,
|
| }
|
|
|
| void TabContents::UpdateEncoding(RenderViewHost* render_view_host,
|
| - const std::wstring& encoding) {
|
| + const std::string& encoding) {
|
| set_encoding(encoding);
|
| }
|
|
|
| @@ -2496,7 +2496,7 @@ void TabContents::Observe(NotificationType type,
|
| }
|
| }
|
|
|
| -void TabContents::set_encoding(const std::wstring& encoding) {
|
| +void TabContents::set_encoding(const std::string& encoding) {
|
| encoding_ = CharacterEncoding::GetCanonicalEncodingNameByAliasName(encoding);
|
| }
|
|
|
|
|