UI font localization part 2

chrome/common/gfx/chrome_font_win.cc

 // Copyright (c) 2006-2008 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/common/gfx/chrome_font.h"
 
 #include <windows.h>
 #include <math.h>
 
 #include <algorithm>
 
 #include "base/logging.h"
 #include "base/win_util.h"
-#include "chrome/common/l10n_util.h"
+#include "chrome/common/l10n_util_win.h"
 #include "grit/generated_resources.h"
 #include "grit/locale_settings.h"
 
 /*static*/
 ChromeFont::HFontRef* ChromeFont::base_font_ref_;
 
 // If the tmWeight field of a TEXTMETRIC structure has a value >= this, the
 // font is bold.
 static const int kTextMetricWeightBold = 700;
 
@@ skipping 46 matching lines @@
                     font_name.c_str());
   return ChromeFont::CreateFont(hf);
 }
 
 // static
 ChromeFont::HFontRef* ChromeFont::GetBaseFontRef() {
   if (base_font_ref_ == NULL) {
     NONCLIENTMETRICS metrics;
     win_util::GetNonClientMetrics(&metrics);
 
+    l10n_util::AdjustUIFont(&metrics.lfMessageFont);
+
     // See comment in ChromeFont::DeriveFont() about font size.
+    // TODO(jungshik): Add a per-locale resource entry for the minimum
+    // font size  and actually enforce the lower-bound. 5 is way too small
+    // for CJK, Thai, and Indian locales.
     DCHECK_GE(abs(metrics.lfMessageFont.lfHeight), 5);
     HFONT font = CreateFontIndirect(&metrics.lfMessageFont);
     DLOG_ASSERT(font);
     base_font_ref_ = ChromeFont::CreateHFontRef(font);
     // base_font_ref_ is global, up the ref count so it's never deleted.
     base_font_ref_->AddRef();
   }
   return base_font_ref_;
 }
 
@@ skipping 105 matching lines @@
   if (font_metrics.tmUnderlined) {
     style |= ChromeFont::UNDERLINED;
   }
   if (font_metrics.tmWeight >= kTextMetricWeightBold) {
     style |= ChromeFont::BOLD;
   }
 
   return new HFontRef(font, height, baseline, ave_char_width, style,
                       dlu_base_x);
 }