summaryrefslogtreecommitdiffstats
path: root/chrome/browser/encoding_menu_controller_delegate.cc
diff options
context:
space:
mode:
authorjungshik@google.com <jungshik@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-12-11 20:30:49 +0000
committerjungshik@google.com <jungshik@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-12-11 20:30:49 +0000
commit1c5bf633736fa19e6e9950fc5bb4aab378803ad8 (patch)
treee17b6ca7b18b9c28936bebcef0f58d2ef1016fb1 /chrome/browser/encoding_menu_controller_delegate.cc
parentafa5a314c7d3698c8065ba824e5700c2af211844 (diff)
downloadchromium_src-1c5bf633736fa19e6e9950fc5bb4aab378803ad8.zip
chromium_src-1c5bf633736fa19e6e9950fc5bb4aab378803ad8.tar.gz
chromium_src-1c5bf633736fa19e6e9950fc5bb4aab378803ad8.tar.bz2
A follow-up to a recent unforking of WebCore/platform/text/TextCodecICU.cpp (r6540).
Up to now, we canonicalized to EUC-KR, TIS-620 and GB2312, but with unforking, we'd better canonicalize to windows-949, windows-874 and GBK. Another change is necessary in Webkit (Document.cpp), which I'll do it while unforking it. BUG=3703 Review URL: http://codereview.chromium.org/13645 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@6817 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/encoding_menu_controller_delegate.cc')
-rw-r--r--chrome/browser/encoding_menu_controller_delegate.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome/browser/encoding_menu_controller_delegate.cc b/chrome/browser/encoding_menu_controller_delegate.cc
index 38dcb10..db81e93 100644
--- a/chrome/browser/encoding_menu_controller_delegate.cc
+++ b/chrome/browser/encoding_menu_controller_delegate.cc
@@ -42,7 +42,7 @@ bool EncodingMenuControllerDelegate::IsItemChecked(int id) const {
case IDC_ENCODING_UTF16LE:
case IDC_ENCODING_ISO88591:
case IDC_ENCODING_WINDOWS1252:
- case IDC_ENCODING_GB2312:
+ case IDC_ENCODING_GBK:
case IDC_ENCODING_GB18030:
case IDC_ENCODING_BIG5:
case IDC_ENCODING_BIG5HKSCS: