Remove uses of FontList::Derive*(..) in views payments dialogs.

chrome/browser/ui/views/payments/payment_request_views_util.cc

Index: chrome/browser/ui/views/payments/payment_request_views_util.cc
diff --git a/chrome/browser/ui/views/payments/payment_request_views_util.cc b/chrome/browser/ui/views/payments/payment_request_views_util.cc
index 7d8ffd8bd936be025a91c257c95cba06509fd88e..162fab8b62ad5825029def3eed6c8ed033304c8b 100644
--- a/chrome/browser/ui/views/payments/payment_request_views_util.cc
+++ b/chrome/browser/ui/views/payments/payment_request_views_util.cc
@@ -9,6 +9,7 @@
 #include "base/macros.h"
 #include "base/memory/ptr_util.h"
 #include "base/strings/utf_string_conversions.h"
+#include "chrome/browser/ui/views/harmony/chrome_typography.h"
 #include "chrome/browser/ui/views/payments/payment_request_dialog_view_ids.h"
 #include "chrome/browser/ui/views/payments/payment_request_sheet_controller.h"
 #include "chrome/grit/chromium_strings.h"
@@ -81,11 +82,11 @@ std::unique_ptr<views::View> GetBaseProfileLabel(AddressStyleType type,
   container->SetLayoutManager(layout.release());
 
   if (!s1.empty()) {
-    std::unique_ptr<views::Label> label = base::MakeUnique<views::Label>(s1);
-    if (type == AddressStyleType::DETAILED) {
-      const gfx::FontList& font_list = label->font_list();
-      label->SetFontList(font_list.DeriveWithWeight(gfx::Font::Weight::BOLD));
-    }
+    const int text_style = type == AddressStyleType::DETAILED
+                               ? STYLE_EMPHASIZED
+                               : views::style::STYLE_PRIMARY;
+    std::unique_ptr<views::Label> label = base::MakeUnique<views::Label>(
+        s1, views::style::CONTEXT_LABEL, text_style);
     label->set_id(static_cast<int>(DialogViewID::PROFILE_LABEL_LINE_1));
     label->SetHorizontalAlignment(gfx::ALIGN_LEFT);
     if (disabled_state) {
@@ -140,9 +141,8 @@ std::unique_ptr<views::View> GetShippingAddressLabel(
 std::unique_ptr<views::Label> GetLabelForMissingInformation(
     const base::string16& missing_info) {
   std::unique_ptr<views::Label> label =
-      base::MakeUnique<views::Label>(missing_info);
+      base::MakeUnique<views::Label>(missing_info, CONTEXT_DEPRECATED_SMALL);
   label->set_id(static_cast<int>(DialogViewID::PROFILE_LABEL_ERROR));
-  label->SetFontList(label->GetDefaultFontList().DeriveWithSizeDelta(-1));
   // Missing information typically has a nice shade of blue.
   label->SetEnabledColor(label->GetNativeTheme()->GetSystemColor(
       ui::NativeTheme::kColorId_LinkEnabled));
@@ -226,11 +226,9 @@ std::unique_ptr<views::View> CreateSheetHeaderView(
     layout->AddView(back_arrow);
   }
 
-  views::Label* title_label = new views::Label(title);
+  views::Label* title_label =
+      new views::Label(title, views::style::CONTEXT_DIALOG_TITLE);
   title_label->SetHorizontalAlignment(gfx::ALIGN_LEFT);
-  title_label->SetFontList(
-      title_label->GetDefaultFontList().DeriveWithSizeDelta(
-          ui::kTitleFontSizeDelta));
   layout->AddView(title_label);
 
   return container;
@@ -282,9 +280,9 @@ std::unique_ptr<views::View> GetShippingAddressLabelWithError(
       GetShippingAddressLabel(type, locale, profile, disabled_state);
 
   if (!error.empty()) {
-    std::unique_ptr<views::Label> label = base::MakeUnique<views::Label>(error);
+    std::unique_ptr<views::Label> label =
+        base::MakeUnique<views::Label>(error, CONTEXT_DEPRECATED_SMALL);
     label->set_id(static_cast<int>(DialogViewID::PROFILE_LABEL_ERROR));
-    label->SetFontList(label->GetDefaultFontList().DeriveWithSizeDelta(-1));
     // Error information is typically in red.
     label->SetEnabledColor(label->GetNativeTheme()->GetSystemColor(
         ui::NativeTheme::kColorId_AlertSeverityHigh));
@@ -351,11 +349,17 @@ std::unique_ptr<views::Border> CreatePaymentRequestRowBorder(
 }
 
 std::unique_ptr<views::Label> CreateBoldLabel(const base::string16& text) {
-  std::unique_ptr<views::Label> label = base::MakeUnique<views::Label>(text);
-
-  label->SetFontList(
-      label->font_list().DeriveWithWeight(gfx::Font::Weight::BOLD));
+  return base::MakeUnique<views::Label>(text, views::style::CONTEXT_LABEL,
+                                        STYLE_EMPHASIZED);
+}
 
+std::unique_ptr<views::Label> CreateMediumLabel(const base::string16& text) {
+  // TODO(tapted): This should refer to a style in the Chrome typography spec.
+  // Also, it needs to handle user setups where the default font is BOLD already
+  // since asking for a MEDIUM font will give a lighter font.
+  std::unique_ptr<views::Label> label = base::MakeUnique<views::Label>(text);
+  label->SetFontList(ResourceBundle::GetSharedInstance().GetFontListWithDelta(

[anthonyvd, 2017/05/22 13:10:32]

Our UI specs typically request that we fallback to BOLD if MEDIUM isn't
available. How do we achieve that?

Also, do we already have a way to map Chrome Typography spec to code? Let's say
our UXer asks us for a "Body 2 - secondary" label, do we have a straightforward
way of getting that? If we do, I can easily do a pass through this code to fix
this since I'm pretty sure our mocks are expressed in terms of the spec already.

[tapted, 2017/05/22 21:09:26]

There is logic in the typography spec to do this for buttons -
https://cs.chromium.org/chromium/src/chrome/browser/ui/views/harmony/harmony_...

But if these labels should really be using a MEDIUM weight font, UX need to add
one to the harmony spec ( http://crbug.com/691891 ).

Same with CONTEXT_DEPRECATED_SMALL - there is no 11pt font in the Harmony spec
and, when running with --secondary-ui-md, harmony_typography_provider.cc will
provide the default font instead.
Yup - the extra arguments to the views::Label constructor are from
foo_typography.h headers. There's a "context" and a "style" (kinda like
element/class in CSS). e.g. chrome_typography.h -
https://cs.chromium.org/chromium/src/chrome/browser/ui/views/harmony/chrome_t...

and the set of styles used in views, from ui/views/style/typography.h

You can also call views::style::GetFont, but passing them to Label encapsulates
the size, line spacing and (soon) color.

+      ui::kLabelFontSizeDelta, gfx::Font::NORMAL, gfx::Font::Weight::MEDIUM));
   return label;
 }
 
@@ -372,16 +376,13 @@ std::unique_ptr<views::View> CreateShippingOptionLabel(
   container->SetLayoutManager(layout.release());
 
   if (shipping_option) {
+    const base::string16& text = base::UTF8ToUTF16(shipping_option->label);
     std::unique_ptr<views::Label> shipping_label =
-        base::MakeUnique<views::Label>(
-            base::UTF8ToUTF16(shipping_option->label));
+        emphasize_label ? CreateMediumLabel(text)
+                        : base::MakeUnique<views::Label>(text);
     shipping_label->SetHorizontalAlignment(gfx::ALIGN_LEFT);
     shipping_label->set_id(
         static_cast<int>(DialogViewID::SHIPPING_OPTION_DESCRIPTION));
-    if (emphasize_label) {
-      shipping_label->SetFontList(shipping_label->font_list().DeriveWithWeight(
-          gfx::Font::Weight::MEDIUM));
-    }
     container->AddChildView(shipping_label.release());
 
     std::unique_ptr<views::Label> amount_label =