Merge 13114 - Make the font family and the font size used in dom UI localizab...

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>
@@ skipping 130 matching lines @@
     font_info.lfHeight += size_delta;
   }
   // Even with "Small Fonts", the smallest readable font size is 5. It is easy
   // to create a non-drawing font and forget about the fact that text should be
   // drawn in the UI. This test ensures that the font will be readable.
   DCHECK_GE(abs(font_info.lfHeight), 5);
   font_info.lfUnderline = ((style & UNDERLINED) == UNDERLINED);
   font_info.lfItalic = ((style & ITALIC) == ITALIC);
   font_info.lfWeight = (style & BOLD) ? FW_BOLD : FW_NORMAL;
 
-  if (style & WEB) {
-    font_info.lfPitchAndFamily = FF_SWISS;
-    wcscpy_s(font_info.lfFaceName,
-             l10n_util::GetString(IDS_WEB_FONT_FAMILY).c_str());
-  }
-
   HFONT hfont = CreateFontIndirect(&font_info);
   return ChromeFont(CreateHFontRef(hfont));
 }
 
 int ChromeFont::GetStringWidth(const std::wstring& text) const {
   int width = 0;
   HDC dc = GetDC(NULL);
   HFONT previous_font = static_cast<HFONT>(SelectObject(dc, hfont()));
   SIZE size;
   if (GetTextExtentPoint32(dc, text.c_str(), static_cast<int>(text.size()),
@@ skipping 36 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);
 }