Allow various font weights in gfx.

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

 // Copyright (c) 2012 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/browser/ui/cocoa/omnibox/omnibox_view_mac.h"
 
 #include <Carbon/Carbon.h>  // kVK_Return
 
 #include "base/mac/foundation_util.h"
 #include "base/metrics/histogram.h"
@@ skipping 499 matching lines @@
     // |storage|.
     [field_ stringValue];
   } else {
     SetText(GetText());
   }
 }
 
 void OmniboxViewMac::ApplyTextStyle(
     NSMutableAttributedString* attributedString) {
   [attributedString addAttribute:NSFontAttributeName
-                           value:GetFieldFont(gfx::Font::NORMAL)
+                           value:GetNormalFieldFont()
                            range:NSMakeRange(0, [attributedString length])];
 
   // Make a paragraph style locking in the standard line height as the maximum,
   // otherwise the baseline may shift "downwards".
   base::scoped_nsobject<NSMutableParagraphStyle> paragraph_style(
       [[NSMutableParagraphStyle alloc] init]);
   CGFloat line_height = [[field_ cell] lineHeight];
   [paragraph_style setMaximumLineHeight:line_height];
   [paragraph_style setMinimumLineHeight:line_height];
   [paragraph_style setLineBreakMode:NSLineBreakByTruncatingTail];
@@ skipping 534 matching lines @@
     // If the text field has a field editor, it's the first responder, meaning
     // that it's already focused. makeFirstResponder: will select all, so only
     // call it if this behavior is desired.
     if (select_all || ![field_ currentEditor])
       [[field_ window] makeFirstResponder:field_];
     DCHECK_EQ([field_ currentEditor], [[field_ window] firstResponder]);
   }
 }
 
 // static
-NSFont* OmniboxViewMac::GetFieldFont(int style) {
+NSFont* OmniboxViewMac::GetNormalFieldFont() {
   // This value should be kept in sync with InstantPage::InitializeFonts.

[tapted, 2016/03/29 20:13:46]

InstantPage::InitializeFonts doesn't seem to exist any more, so when you move
the constants, these comments can be deleted.

[Mikus, 2016/03/30 13:58:24]

Done.

+  const int kOmniboxNormalFontSizeDelta = 1;

[msw, 2016/03/29 19:18:14]

nit: these probably belong in a file-local anon namespace.

[Mikus, 2016/03/30 13:58:24]

Done.

   ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
-  return rb.GetFontList(ui::ResourceBundle::BaseFont).Derive(1, style)
-      .GetPrimaryFont().GetNativeFont();
-}
-
-NSFont* OmniboxViewMac::GetLargeFont(int style) {
-  ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
-  return rb.GetFontList(ui::ResourceBundle::LargeFont)
-      .Derive(1, style)
-      .GetPrimaryFont()
+  return rb
+      .GetFontWithDelta(kOmniboxNormalFontSizeDelta, gfx::Font::NORMAL,
+                        gfx::Font::Weight::NORMAL)
       .GetNativeFont();
 }
 
-NSFont* OmniboxViewMac::GetSmallFont(int style) {
+NSFont* OmniboxViewMac::GetBoldFieldFont() {
+  // This value should be kept in sync with InstantPage::InitializeFonts.
+  const int kOmniboxNormalFontSizeDelta = 1;
   ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
-  return rb.GetFontList(ui::ResourceBundle::SmallFont)
-      .Derive(1, style)
-      .GetPrimaryFont()
+  return rb
+      .GetFontWithDelta(kOmniboxNormalFontSizeDelta, gfx::Font::NORMAL,
+                        gfx::Font::Weight::BOLD)
       .GetNativeFont();
 }
 
+NSFont* OmniboxViewMac::GetLargeFont() {
+  const int kOmniboxLargeFontSizeDelta = 9;
+  ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
+  return rb
+      .GetFontWithDelta(kOmniboxLargeFontSizeDelta, gfx::Font::NORMAL,
+                        gfx::Font::Weight::NORMAL)
+      .GetNativeFont();
+}
+
+NSFont* OmniboxViewMac::GetSmallFont() {
+  const int kOmniboxSmallFontSizeDelta = 0;

[msw, 2016/03/29 19:18:14]

ha! the old code was getting the small font (-1 delta) and then deriving one
size larger from that(+1 delta), so this should indeed be zero, but I wonder if
we should just avoid the deriving altogether now, and just return
rb.GetFont(gfx::Font::NORMAL), but maybe Trent likes the consistency of
kOmnibox*FontSizeDelta constants, etc.

[tapted, 2016/03/29 20:13:46]

Yeah although it's common for code to use rb.GetFont(ResourceBundle::BaseFont),
I have a preference for the separate constants.
ResourceBundle::BaseFont/SmallFont, etc. aren't really any better than magic
numbers - they don't give any semantic meaning and it encourages this tendency
to take something "close" to what you actually need and derive something new,
which is much more expensive than relying on the cache in ResourceBundle.

[Mikus, 2016/03/30 13:58:24]

Acknowledged.

+  ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
+  return rb
+      .GetFontWithDelta(kOmniboxSmallFontSizeDelta, gfx::Font::NORMAL,
+                        gfx::Font::Weight::NORMAL)
+      .GetNativeFont();
+}
+
 int OmniboxViewMac::GetOmniboxTextLength() const {
   return static_cast<int>(GetTextLength());
 }
 
 NSUInteger OmniboxViewMac::GetTextLength() const {
   return [field_ currentEditor] ?  [[[field_ currentEditor] string] length] :
                                    [[field_ stringValue] length];
 }
 
 bool OmniboxViewMac::IsCaretAtEnd() const {
   const NSRange selection = GetSelectedRange();
   return NSMaxRange(selection) == GetTextLength();
 }