Use ICU script code "Jpan" instead of "Hrkt" in Japanese pref names

chrome/browser/ui/prefs/prefs_tab_helper.cc

 // Copyright (c) 2012 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/ui/prefs/prefs_tab_helper.h"
 
 #include "base/string_split.h"
 #include "base/string_util.h"
 #include "base/stringprintf.h"
 #include "chrome/browser/browser_process.h"
@@ skipping 93 matching lines @@
   prefs::kWebKitMinimumLogicalFontSize,
   prefs::kWebKitPluginsEnabled,
   prefs::kWebkitTabsToLinks,
   prefs::kWebKitUsesUniversalDetector
 };
 
 const int kPrefsToObserveLength = arraysize(kPrefsToObserve);
 
 // Registers a preference under the path |map_name| for each script used for
 // per-script font prefs.  For example, if |map_name| is "fonts.serif", then
-// "fonts.serif.Arab", "fonts.serif.Hang", etc. are registered.
+// "fonts.serif.Arab", "fonts.serif.Kore", etc. are registered.

[jungshik at Google, 2012/06/14 21:49:47]

Leave alone 'Hang' and exclude 'Kore'. 

[falken, 2012/06/15 03:58:11]

Done.

 void RegisterFontFamilyMap(PrefService* prefs, const char* map_name) {
   for (size_t i = 0; i < prefs::kWebKitScriptsForFontFamilyMapsLength; ++i) {
     const char* script = prefs::kWebKitScriptsForFontFamilyMaps[i];
     std::string pref_name_str = base::StringPrintf("%s.%s", map_name, script);
     const char* pref_name = pref_name_str.c_str();
     if (!prefs->FindPreference(pref_name))
       prefs->RegisterStringPref(pref_name, "", PrefService::UNSYNCABLE_PREF);
   }
 }
 
@@ skipping 92 matching lines @@
   DCHECK_GT(len, kScriptNameLength);
   const char* scriptName = &pref_name[len - kScriptNameLength];
   int32 code = u_getPropertyValueEnum(UCHAR_SCRIPT, scriptName);
   DCHECK(code >= 0 && code < USCRIPT_CODE_LIMIT);
   return static_cast<UScriptCode>(code);
 }
 
 // If |scriptCode| is a member of a family of "similar" script codes, returns
 // the script code in that family that is used in font pref names.  For example,
 // USCRIPT_HANGUL and USCRIPT_KOREAN are considered equivalent for the purposes
-// of font selection.  Chrome uses the script code USCRIPT_HANGUL (script name
-// "Hang") in Korean font pref names (for example,
-// "webkit.webprefs.fonts.serif.Hang").  So, if |scriptCode| is USCRIPT_KOREAN,
-// the function returns USCRIPT_HANGUL.  If |scriptCode| is not a member of such
+// of font selection.  Chrome uses the script code USCRIPT_KOREAN (script name
+// "Kore") in Korean font pref names (for example,
+// "webkit.webprefs.fonts.serif.Kore").  So, if |scriptCode| is USCRIPT_HANGUL,
+// the function returns USCRIPT_KOREAN.  If |scriptCode| is not a member of such
 // a family, returns |scriptCode|.
 UScriptCode GetScriptForFontPrefMatching(UScriptCode scriptCode) {
   switch (scriptCode) {
   case USCRIPT_HIRAGANA:
   case USCRIPT_KATAKANA:
-  case USCRIPT_JAPANESE:
-    return USCRIPT_KATAKANA_OR_HIRAGANA;
-  case USCRIPT_KOREAN:
-    return USCRIPT_HANGUL;
+  case USCRIPT_KATAKANA_OR_HIRAGANA:
+    return USCRIPT_JAPANESE;
+  case USCRIPT_HANGUL:
+    return USCRIPT_KOREAN;

[jungshik at Google, 2012/06/14 21:49:47]

Perhaps, Kore -> Hang mapping makes more sense. 

[falken, 2012/06/15 03:58:11]

Done.

   default:
     return scriptCode;
   }
 }
 
 // Returns the primary script used by the browser's UI locale.  For example, if
 // the locale is "ru", the function returns USCRIPT_CYRILLIC, and if the locale
 // is "en", the function returns USCRIPT_LATIN.
 UScriptCode GetScriptOfBrowserLocale() {
   std::string locale = g_browser_process->GetApplicationLocale();
@@ skipping 280 matching lines @@
 
 void PrefsTabHelper::UpdateRendererPreferences() {
   renderer_preferences_util::UpdateFromSystemSettings(
       web_contents_->GetMutableRendererPrefs(), GetProfile());
   web_contents_->GetRenderViewHost()->SyncRendererPrefs();
 }
 
 Profile* PrefsTabHelper::GetProfile() {
   return Profile::FromBrowserContext(web_contents_->GetBrowserContext());
 }