Character encoding override

chrome/browser/encoding_menu_controller_delegate.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/encoding_menu_controller_delegate.h"
 
 #include "chrome/app/chrome_dll_resource.h"
 #include "chrome/browser/browser.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/character_encoding.h"
 #include "chrome/browser/profile.h"
-#include "chrome/browser/tab_contents.h"
+#include "chrome/browser/web_contents.h"
 #include "chrome/common/l10n_util.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/pref_service.h"
 
 #include "generated_resources.h"
 
 EncodingMenuControllerDelegate::EncodingMenuControllerDelegate(
     Browser* browser, Controller* wrapped)
     : BaseControllerDelegate(wrapped),
       browser_(browser) {
 }
 
 bool EncodingMenuControllerDelegate::IsItemChecked(int id) const {
   Profile* profile = browser_->profile();
   if (!profile)
     return false;
   TabContents* current_tab = browser_->GetSelectedTabContents();
   if (!current_tab)
     return false;
-  std::wstring encoding_name = current_tab->encoding();
-  if (encoding_name.empty())
-    encoding_name = profile->GetPrefs()->GetString(prefs::kDefaultCharset);
+  std::wstring encoding;
+  if (current_tab->AsWebContents())
+    encoding = current_tab->AsWebContents()->encoding();
+  if (encoding.empty())
+    encoding = profile->GetPrefs()->GetString(prefs::kDefaultCharset);
   switch (id) {
     case IDC_ENCODING_AUTO_DETECT:
       return profile->GetPrefs()->GetBoolean(
           prefs::kWebKitUsesUniversalDetector);
     case IDC_ENCODING_UTF8:
     case IDC_ENCODING_UTF16LE:
     case IDC_ENCODING_ISO88591:
     case IDC_ENCODING_WINDOWS1252:
     case IDC_ENCODING_GB2312:
     case IDC_ENCODING_GB18030:
@@ skipping 21 matching lines @@
     case IDC_ENCODING_ISO885910:
     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:
-      return (!encoding_name.empty() && encoding_name ==
+      return (!encoding.empty() && encoding ==
           CharacterEncoding::GetCanonicalEncodingNameByCommandId(id));
     default:
       return false;
   }
 }
 
 void EncodingMenuControllerDelegate::BuildEncodingMenu(
     Profile* profile, Menu* encoding_menu) {
   // Append auto-detection item.
   encoding_menu->AppendMenuItem(IDC_ENCODING_AUTO_DETECT,
@@ skipping 24 matching lines @@
       if (l10n_util::AdjustStringForLocaleDirection(encoding,
                                                     &bidi_safe_encoding))
         encoding.swap(bidi_safe_encoding);
       encoding_menu->AppendMenuItem(*it, encoding, Menu::RADIO);
     }
     else
       encoding_menu->AppendSeparator();
   }
 }