Merge 13773 - For some Indian locales, the automatic font fallback by Windows...

chrome/common/gfx/chrome_font_win.cc

Index: chrome/common/gfx/chrome_font_win.cc
===================================================================
--- chrome/common/gfx/chrome_font_win.cc	(revision 14343)
+++ chrome/common/gfx/chrome_font_win.cc	(working copy)
@@ -11,7 +11,7 @@
 
 #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"
 
@@ -78,7 +78,12 @@
     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);
Property changes on: chrome\common\gfx\chrome_font_win.cc
___________________________________________________________________
Added: svn:mergeinfo
   Merged /branches/chrome_webkit_merge_branch/chrome/common/gfx/chrome_font_win.cc:r69-2775
   Merged /trunk/src/chrome/common/gfx/chrome_font_win.cc:r13773