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/app/chrome_dll_resource.h | |
| 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/app/chrome_dll_resource.h')
| -rw-r--r-- | chrome/app/chrome_dll_resource.h | 2 |
1 files changed, 1 insertions, 1 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 |