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

chrome/common/win_util.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/win_util.h"
 
 #include <atlbase.h>
 #include <atlapp.h>
 #include <commdlg.h>
 #include <dwmapi.h>
 #include <shellapi.h>
 #include <shlobj.h>
 
 #include "base/file_util.h"
 #include "base/gfx/gdi_util.h"
 #include "base/gfx/png_encoder.h"
 #include "base/logging.h"
 #include "base/registry.h"
 #include "base/scoped_handle.h"
 #include "base/string_util.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 "net/base/mime_util.h"
 
 // Ensure that we pick up this link library.
 #pragma comment(lib, "dwmapi.lib")
 
 namespace win_util {
 
 const int kAutoHideTaskbarThicknessPx = 2;
 
@@ skipping 814 matching lines @@
   const wchar_t* caption_ptr = caption.c_str();
   if (l10n_util::AdjustStringForLocaleDirection(caption, &localized_caption))
     caption_ptr = localized_caption.c_str();
 
   return ::MessageBox(hwnd, text_ptr, caption_ptr, actual_flags);
 }
 
 ChromeFont GetWindowTitleFont() {
   NONCLIENTMETRICS ncm;
   win_util::GetNonClientMetrics(&ncm);
+  l10n_util::AdjustUIFont(&(ncm.lfCaptionFont));
   ScopedHFONT caption_font(CreateFontIndirect(&(ncm.lfCaptionFont)));
   return ChromeFont::CreateFont(caption_font);
 }
 
 }  // namespace win_util