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

7 files changed, 13 insertions, 13 deletions

diff --git a/chrome/app/chrome_dll_resource.h b/chrome/app/chrome_dll_resource.h
index a1f6df5..a0613af 100644
--- a/chrome/app/chrome_dll_resource.h
+++ b/chrome/app/chrome_dll_resource.h
@@ -95,7 +95,7 @@
 #define IDC_ENCODING_UTF16LE            35008
 #define IDC_ENCODING_ISO88591           35009
 #define IDC_ENCODING_WINDOWS1252        35010
-#define IDC_ENCODING_GB2312             35011
+#define IDC_ENCODING_GBK                35011
 #define IDC_ENCODING_GB18030            35012
 #define IDC_ENCODING_BIG5               35013
 #define IDC_ENCODING_BIG5HKSCS          35014
diff --git a/chrome/app/resources/locale_settings_ko.rc b/chrome/app/resources/locale_settings_ko.rc
index 4d13253..a5ef5d4 100644
--- a/chrome/app/resources/locale_settings_ko.rc
+++ b/chrome/app/resources/locale_settings_ko.rc
@@ -4,7 +4,7 @@ STRINGTABLE
 BEGIN
   IDS_WEB_FONT_FAMILY           "Gulim"
   IDS_ACCEPT_LANGUAGES          "ko-KR,ko,en-US,en"
-  IDS_DEFAULT_ENCODING          "EUC-KR"
+  IDS_DEFAULT_ENCODING          "windows-949"
   IDS_STANDARD_FONT_IS_SERIF    "false"
   IDS_FIXED_FONT_FAMILY         "Gulimche"
   IDS_SERIF_FONT_FAMILY         "Batang"
@@ -55,7 +55,7 @@ BEGIN
   IDS_FIRSTRUNBUBBLE_DIALOG_HEIGHT_LINES "12"
   IDS_HELP_CONTENT_URL "http://www.google.com/support/chrome/?hl=ko"
   IDS_BUGREPORT_POST_URL "http://web-bug.appspot.com/bugreport"
-  IDS_STATIC_ENCODING_LIST "EUC-KR"
+  IDS_STATIC_ENCODING_LIST "windows-949"
   IDS_WELCOME_PAGE_URL "http://tools.google.com/chrome/intl/ko/welcome.html"
   IDS_LEARN_MORE_INCOGNITO_URL "http://www.google.com/support/chrome/bin/answer.py?answer=95464&hl=ko"
   IDS_LEARN_MORE_PRIVACY_URL "http://www.google.com/support/chrome/bin/answer.py?answer=114836&hl=ko"
diff --git a/chrome/app/resources/locale_settings_th.rc b/chrome/app/resources/locale_settings_th.rc
index e9ac7e7..5bc88bbc 100644
--- a/chrome/app/resources/locale_settings_th.rc
+++ b/chrome/app/resources/locale_settings_th.rc
@@ -4,7 +4,7 @@ STRINGTABLE
 BEGIN
   IDS_WEB_FONT_FAMILY           "tahoma"
   IDS_ACCEPT_LANGUAGES          "th-TH,th"
-  IDS_DEFAULT_ENCODING          "TIS-620"
+  IDS_DEFAULT_ENCODING          "windows-874"
   IDS_STANDARD_FONT_IS_SERIF    "true"
   IDS_FIXED_FONT_FAMILY         "tahoma"
   IDS_SERIF_FONT_FAMILY         "tahoma"
@@ -55,7 +55,7 @@ BEGIN
   IDS_FIRSTRUNBUBBLE_DIALOG_HEIGHT_LINES "12"
   IDS_HELP_CONTENT_URL "http://www.google.com/support/chrome/?hl=th"
   IDS_BUGREPORT_POST_URL "http://web-bug.appspot.com/bugreport"
-  IDS_STATIC_ENCODING_LIST "TIS-620"
+  IDS_STATIC_ENCODING_LIST "windows-874"
   IDS_WELCOME_PAGE_URL "http://tools.google.com/chrome/intl/th/welcome.html"
   IDS_LEARN_MORE_INCOGNITO_URL "http://www.google.com/support/chrome/bin/answer.py?answer=95464&hl=th"
   IDS_LEARN_MORE_PRIVACY_URL "http://www.google.com/support/chrome/bin/answer.py?answer=114836&hl=th"
diff --git a/chrome/app/resources/locale_settings_zh-CN.rc b/chrome/app/resources/locale_settings_zh-CN.rc
index fccba1e2..0cc2113 100644
--- a/chrome/app/resources/locale_settings_zh-CN.rc
+++ b/chrome/app/resources/locale_settings_zh-CN.rc
@@ -55,7 +55,7 @@ BEGIN
   IDS_FIRSTRUNBUBBLE_DIALOG_HEIGHT_LINES "12"
   IDS_HELP_CONTENT_URL "http://www.google.com/support/chrome/?hl=zh-CN"
   IDS_BUGREPORT_POST_URL "http://web-bug.appspot.com/bugreport"
-  IDS_STATIC_ENCODING_LIST "GB2312,gb18030"
+  IDS_STATIC_ENCODING_LIST "GBK,gb18030"
   IDS_WELCOME_PAGE_URL "http://tools.google.com/chrome/intl/zh-CN/welcome.html"
   IDS_LEARN_MORE_INCOGNITO_URL "http://www.google.com/support/chrome/bin/answer.py?answer=95464&hl=zh-CN"
   IDS_LEARN_MORE_PRIVACY_URL "http://www.google.com/support/chrome/bin/answer.py?answer=114836&hl=zh-CN"
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: