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

chrome/common/l10n_util_win.h

Index: chrome/common/l10n_util_win.h
===================================================================
--- chrome/common/l10n_util_win.h	(revision 14343)
+++ chrome/common/l10n_util_win.h	(working copy)
@@ -26,6 +26,26 @@
 // such as Hebrew.
 void HWNDSetRTLLayout(HWND hwnd);
 
+// See http://blogs.msdn.com/oldnewthing/archive/2005/09/15/467598.aspx
+// and  http://blogs.msdn.com/oldnewthing/archive/2006/06/26/647365.aspx
+// as to why we need these three functions. 
+
+// Return true if the default font (we get from Windows) is not suitable
+// to use in the UI of the current UI (e.g. Malayalam, Bengali). If
+// override_font_family and font_size_scaler are not null, they'll be
+// filled with the font family name and the size scaler.
+bool NeedOverrideDefaultUIFont(std::wstring* override_font_family,
+                               double* font_size_scaler);
+
+// If the default UI font stored in |logfont| is not suitable, its family
+// and size are replaced with those stored in the per-locale resource.
+void AdjustUIFont(LOGFONT* logfont);
+
+// If the font for a given window (pointed to by HWND) is not suitable for the
+// UI in the current UI langauge, its family and size are replaced with those
+// stored in the per-locale resource.
+void AdjustUIFontForWindow(HWND hwnd);
+
 }  // namespace l10n_util
 
 #endif  // CHROME_COMMON_L10N_UTIL_WIN_H_
Property changes on: chrome\common\l10n_util_win.h
___________________________________________________________________
Added: svn:mergeinfo
   Merged /branches/chrome_webkit_merge_branch/chrome/common/l10n_util_win.h:r69-2775
   Merged /trunk/src/chrome/common/l10n_util_win.h:r13773