diff options
| author | jungshik@google.com <jungshik@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-12-11 20:30:49 +0000 |
|---|---|---|
| committer | jungshik@google.com <jungshik@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-12-11 20:30:49 +0000 |
| commit | 1c5bf633736fa19e6e9950fc5bb4aab378803ad8 (patch) | |
| tree | e17b6ca7b18b9c28936bebcef0f58d2ef1016fb1 /chrome/browser | |
| parent | afa5a314c7d3698c8065ba824e5700c2af211844 (diff) | |
| download | chromium_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')
| -rw-r--r-- | chrome/browser/browser.cc | 4 | ||||
| -rw-r--r-- | chrome/browser/character_encoding.cc | 8 | ||||
| -rw-r--r-- | chrome/browser/encoding_menu_controller_delegate.cc | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/chrome/browser/browser.cc b/chrome/browser/browser.cc index 135e823..b630a21 100644 --- a/chrome/browser/browser.cc +++ b/chrome/browser/browser.cc @@ -1152,7 +1152,7 @@ void Browser::ExecuteCommand(int id) { 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_BIG5HKSCS: case IDC_ENCODING_BIG5: @@ -1929,7 +1929,7 @@ void Browser::InitCommandState() { controller_.UpdateCommandEnabled(IDC_ENCODING_UTF16LE, true); controller_.UpdateCommandEnabled(IDC_ENCODING_ISO88591, true); controller_.UpdateCommandEnabled(IDC_ENCODING_WINDOWS1252, true); - controller_.UpdateCommandEnabled(IDC_ENCODING_GB2312, true); + controller_.UpdateCommandEnabled(IDC_ENCODING_GBK, true); controller_.UpdateCommandEnabled(IDC_ENCODING_GB18030, true); controller_.UpdateCommandEnabled(IDC_ENCODING_BIG5HKSCS, true); controller_.UpdateCommandEnabled(IDC_ENCODING_BIG5, true); diff --git a/chrome/browser/character_encoding.cc b/chrome/browser/character_encoding.cc index 6fb8d97..4bb9575 100644 --- a/chrome/browser/character_encoding.cc +++ b/chrome/browser/character_encoding.cc @@ -34,15 +34,15 @@ static CanonicalEncodingData canonical_encoding_names[] = { { IDC_ENCODING_UTF16LE, L"UTF-16LE", IDS_ENCODING_UNICODE }, { IDC_ENCODING_ISO88591, L"ISO-8859-1", IDS_ENCODING_WESTERN }, { IDC_ENCODING_WINDOWS1252, L"windows-1252", IDS_ENCODING_WESTERN }, - { IDC_ENCODING_GB2312, L"GB2312", IDS_ENCODING_SIMP_CHINESE }, + { IDC_ENCODING_GBK, L"GBK", IDS_ENCODING_SIMP_CHINESE }, { IDC_ENCODING_GB18030, L"gb18030", IDS_ENCODING_SIMP_CHINESE }, { IDC_ENCODING_BIG5, L"Big5", IDS_ENCODING_TRAD_CHINESE }, { IDC_ENCODING_BIG5HKSCS, L"Big5-HKSCS", IDS_ENCODING_TRAD_CHINESE }, - { IDC_ENCODING_KOREAN, L"EUC-KR", IDS_ENCODING_KOREAN }, + { IDC_ENCODING_KOREAN, L"windows-949", IDS_ENCODING_KOREAN }, { IDC_ENCODING_SHIFTJIS, L"Shift_JIS", IDS_ENCODING_JAPANESE }, { IDC_ENCODING_ISO2022JP, L"ISO-2022-JP", IDS_ENCODING_JAPANESE }, { IDC_ENCODING_EUCJP, L"EUC-JP", IDS_ENCODING_JAPANESE }, - { IDC_ENCODING_THAI, L"TIS-620", IDS_ENCODING_THAI }, + { IDC_ENCODING_THAI, L"windows-874", IDS_ENCODING_THAI }, { IDC_ENCODING_ISO885915, L"ISO-8859-15", IDS_ENCODING_WESTERN }, { IDC_ENCODING_MACINTOSH, L"macintosh", IDS_ENCODING_WESTERN }, { IDC_ENCODING_ISO88592, L"ISO-8859-2", IDS_ENCODING_CENTRAL_EUROPEAN }, @@ -152,7 +152,7 @@ const int default_encoding_menus[] = { IDC_ENCODING_ISO88591, IDC_ENCODING_WINDOWS1252, 0, - IDC_ENCODING_GB2312, + IDC_ENCODING_GBK, IDC_ENCODING_GB18030, IDC_ENCODING_BIG5, IDC_ENCODING_BIG5HKSCS, 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: |