Allow various font weights in gfx.

chrome/browser/ui/cocoa/omnibox/omnibox_popup_cell.mm

 // Copyright 2013 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.
 
 #import "chrome/browser/ui/cocoa/omnibox/omnibox_popup_cell.h"
 
 #include <stddef.h>
 
 #include <algorithm>
 #include <cmath>
@@ skipping 57 matching lines @@
   return skia::SkColorToCalibratedNSColor(SkColorSetRGB(0x0b, 0x80, 0x43));
 }
 NSColor* NegativeTextColor() {
   return skia::SkColorToCalibratedNSColor(SkColorSetRGB(0xc5, 0x39, 0x29));
 }
 NSColor* URLTextColor() {
   return [NSColor colorWithCalibratedRed:0.0 green:0.55 blue:0.0 alpha:1.0];
 }
 
 NSFont* FieldFont() {
-  return OmniboxViewMac::GetFieldFont(gfx::Font::NORMAL);
+  return OmniboxViewMac::GetNormalFieldFont();
 }
 NSFont* BoldFieldFont() {
-  return OmniboxViewMac::GetFieldFont(gfx::Font::BOLD);
+  return OmniboxViewMac::GetBoldFieldFont();
 }
 NSFont* LargeFont() {
-  return OmniboxViewMac::GetLargeFont(gfx::Font::NORMAL);
+  return OmniboxViewMac::GetLargeFont();
 }
 NSFont* LargeSuperscriptFont() {
-  NSFont* font = OmniboxViewMac::GetLargeFont(gfx::Font::NORMAL);
+  NSFont* font = OmniboxViewMac::GetLargeFont();
   // Calculate a slightly smaller font. The ratio here is somewhat arbitrary.
   // Proportions from 5/9 to 5/7 all look pretty good.
   CGFloat size = [font pointSize] * 5.0 / 9.0;
   NSFontDescriptor* descriptor = [font fontDescriptor];
   return [NSFont fontWithDescriptor:descriptor size:size];
 }
 NSFont* SmallFont() {
-  return OmniboxViewMac::GetSmallFont(gfx::Font::NORMAL);
+  return OmniboxViewMac::GetSmallFont();
 }
 
 CGFloat GetContentAreaWidth(NSRect cellFrame) {
   return NSWidth(cellFrame) - kTextStartOffset;
 }
 
 NSAttributedString* CreateAnswerStringHelper(const base::string16& text,
                                              NSInteger style_type,
                                              bool is_bold) {
   NSDictionary* answer_style = nil;
@@ skipping 521 matching lines @@
   return base::i18n::IsRTL() ? (inputWidth - glyphOffset) : glyphOffset;
 }
 
 + (NSAttributedString*)createSeparatorString {
   base::string16 raw_separator =
       l10n_util::GetStringUTF16(IDS_AUTOCOMPLETE_MATCH_DESCRIPTION_SEPARATOR);
   return CreateAttributedString(raw_separator, DimTextColor());
 }
 
 @end