Allow various font weights in gfx.

chrome/browser/ui/views/omnibox/omnibox_result_view.cc

Index: chrome/browser/ui/views/omnibox/omnibox_result_view.cc
diff --git a/chrome/browser/ui/views/omnibox/omnibox_result_view.cc b/chrome/browser/ui/views/omnibox/omnibox_result_view.cc
index 3b336b7a0661f7dc1bb65b57a8b0727eb0f793b6..b26da416235815664d186343114533f94d008291 100644
--- a/chrome/browser/ui/views/omnibox/omnibox_result_view.cc
+++ b/chrome/browser/ui/views/omnibox/omnibox_result_view.cc
@@ -222,9 +222,9 @@ OmniboxResultView::OmniboxResultView(OmniboxPopupContentsView* model,
       model_index_(model_index),
       location_bar_view_(location_bar_view),
       font_list_(font_list),
-      font_height_(
-          std::max(font_list.GetHeight(),
-                   font_list.DeriveWithStyle(gfx::Font::BOLD).GetHeight())),
+      font_height_(std::max(
+          font_list.GetHeight(),
+          font_list.DeriveWithWeight(gfx::Font::Weight::BOLD).GetHeight())),
       mirroring_context_(new MirroringContext()),
       keyword_icon_(new views::ImageView()),
       animation_(new gfx::SlideAnimation(this)) {
@@ -497,7 +497,7 @@ scoped_ptr<gfx::RenderText> OmniboxResultView::CreateClassifiedRenderText(
 
     // Calculate style-related data.
     if (classifications[i].style & ACMatchClassification::MATCH)
-      render_text->ApplyStyle(gfx::BOLD, true, current_range);
+      render_text->ApplyWeight(gfx::Font::Weight::BOLD, current_range);
 
     ColorKind color_kind = TEXT;
     if (classifications[i].style & ACMatchClassification::URL) {
@@ -815,7 +815,7 @@ void OmniboxResultView::AppendAnswerTextHelper(gfx::RenderText* destination,
   const TextStyle& text_style = GetTextStyle(text_type);
   // TODO(dschuyler): follow up on the problem of different font sizes within
   // one RenderText.  Maybe with destination->SetFontList(...).
-  destination->ApplyStyle(gfx::BOLD, is_bold, range);
+  destination->ApplyWeight(gfx::Font::Weight::BOLD, range);

[Peter Kasting, 2016/03/26 00:56:51]

This looks wrong.  Should this be something like:

  destination->ApplyWeight(
      is_bold ? gfx::Font::Weight::BOLD : gfx::Font::Weight::NORMAL, range);

Or, if we don't need to toggle some regions explicitly to normal, maybe:

  if (is_bold)
    destination->ApplyWeight(gfx::Font::Weight::BOLD, range);

[Mikus, 2016/03/29 10:55:38]

Done.

   destination->ApplyColor(
       GetNativeTheme()->GetSystemColor(text_style.colors[GetState()]), range);
   destination->ApplyBaselineStyle(text_style.baseline, range);