Character encoding override

chrome/browser/browser_commands.cc

 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/browser.h"
 
 #include <commdlg.h>
 #include <shellapi.h>
 
 #include "base/file_version_info.h"
@@ skipping 610 matching lines @@
     case IDC_ENCODING_ISO885914:
     case IDC_ENCODING_ISO885916:
     case IDC_ENCODING_ISO88599:
     case IDC_ENCODING_WINDOWS1254:
     case IDC_ENCODING_ISO88596:
     case IDC_ENCODING_WINDOWS1256:
     case IDC_ENCODING_ISO88598:
     case IDC_ENCODING_WINDOWS1255:
     case IDC_ENCODING_WINDOWS1258: {
       UserMetrics::RecordAction(L"OverrideEncoding", profile_);
-      const std::wstring cur_encoding_name =
+      const std::wstring selected_encoding =
           CharacterEncoding::GetCanonicalEncodingNameByCommandId(id);
       TabContents* current_tab = GetSelectedTabContents();
-      if (!cur_encoding_name.empty() && current_tab)
-        current_tab->set_encoding(cur_encoding_name);
-      // Update user recently selected encoding list.
+      if (!selected_encoding.empty() && current_tab &&
+          current_tab->AsWebContents())
+         current_tab->AsWebContents()->override_encoding(selected_encoding);
+      // Update the list of recently selected encodings.
       std::wstring new_selected_encoding_list;
       if (CharacterEncoding::UpdateRecentlySelectdEncoding(
               profile_->GetPrefs()->GetString(prefs::kRecentlySelectedEncoding),
               id,
               &new_selected_encoding_list))
         profile_->GetPrefs()->SetString(prefs::kRecentlySelectedEncoding,
                                         new_selected_encoding_list);
        break;
     }
 
@@ skipping 395 matching lines @@
 
 ////////////////////////////////////////////////////////////////////////////////
 // Browser, SelectFileDialog::Listener implementation:
 
 void Browser::FileSelected(const std::wstring& path, void* params) {
   GURL file_url = net::FilePathToFileURL(path);
   if (!file_url.is_empty())
     OpenURL(file_url, CURRENT_TAB, PageTransition::TYPED);
 }