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

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

 // Copyright 2016 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/views/payments/payment_request_views_util.h"
 
 #include <vector>
 
 #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"
 #include "chrome/grit/theme_resources.h"
 #include "components/autofill/core/browser/autofill_data_util.h"
 #include "components/autofill/core/browser/autofill_profile.h"
 #include "components/autofill/core/browser/autofill_type.h"
 #include "components/autofill/core/browser/credit_card.h"
 #include "components/autofill/core/browser/field_types.h"
 #include "components/payments/core/payment_options_provider.h"
@@ skipping 52 matching lines @@
                                                  const base::string16& s3,
                                                  bool disabled_state = false) {
   std::unique_ptr<views::View> container = base::MakeUnique<views::View>();
   std::unique_ptr<views::BoxLayout> layout =
       base::MakeUnique<views::BoxLayout>(views::BoxLayout::kVertical, 0, 0, 0);
   layout->set_cross_axis_alignment(
       views::BoxLayout::CROSS_AXIS_ALIGNMENT_START);
   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

[tapted, 2017/05/23 11:31:22]

/b/c/goma_client/gomacc i686-pc-linux-gnu-g++
../../chrome/browser/ui/views/payments/payment_request_views_util.cc: In
function 'std::unique_ptr<views::View>
payments::{anonymous}::GetBaseProfileLabel(payments::AddressStyleType, const
string16&, const string16&, const string16&, bool)':
../../chrome/browser/ui/views/payments/payment_request_views_util.cc:86:32:
error: enumeral mismatch in conditional expression: 'ChromeTextStyle' vs
'views::style::TextStyle' [-Werror=enum-compare]
                                ? 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) {
       label->SetEnabledColor(label->GetNativeTheme()->GetSystemColor(
           ui::NativeTheme::kColorId_LabelDisabledColor));
     }
     container->AddChildView(label.release());
   }
 
   if (!s2.empty()) {
@@ skipping 34 matching lines @@
 
   base::string16 phone = profile.GetInfo(
       autofill::AutofillType(autofill::PHONE_HOME_WHOLE_NUMBER), locale);
 
   return GetBaseProfileLabel(type, name, address, phone, disabled_state);
 }
 
 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));
   return label;
 }
 
 // Paints the gray horizontal line that doesn't span the entire width of the
 // dialog at the bottom of the view it borders.
 class PaymentRequestRowBorderPainter : public views::Painter {
  public:
@@ skipping 63 matching lines @@
     views::SetImageFromVectorIcon(back_arrow, ui::kBackArrowIcon);
     constexpr int kBackArrowSize = 16;
     back_arrow->SetSize(gfx::Size(kBackArrowSize, kBackArrowSize));
     back_arrow->SetFocusBehavior(views::View::FocusBehavior::ALWAYS);
     back_arrow->set_tag(static_cast<int>(
         PaymentRequestCommonTags::BACK_BUTTON_TAG));
     back_arrow->set_id(static_cast<int>(DialogViewID::BACK_BUTTON));
     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;
 }
 
 std::unique_ptr<views::ImageView> CreateInstrumentIconView(
     int icon_resource_id,
     const base::string16& tooltip_text) {
   std::unique_ptr<views::ImageView> card_icon_view =
       base::MakeUnique<views::ImageView>();
@@ skipping 31 matching lines @@
 std::unique_ptr<views::View> GetShippingAddressLabelWithError(
     AddressStyleType type,
     const std::string& locale,
     const autofill::AutofillProfile& profile,
     const base::string16& error,
     bool disabled_state) {
   std::unique_ptr<views::View> base_label =
       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));
     base_label->AddChildView(label.release());
   }
   return base_label;
 }
 
 std::unique_ptr<views::View> GetShippingAddressLabelWithMissingInfo(
     AddressStyleType type,
@@ skipping 46 matching lines @@
 }
 
 std::unique_ptr<views::Border> CreatePaymentRequestRowBorder(
     SkColor color,
     const gfx::Insets& insets) {
   return views::CreateBorderPainter(
       base::MakeUnique<PaymentRequestRowBorderPainter>(color), insets);
 }
 
 std::unique_ptr<views::Label> CreateBoldLabel(const base::string16& text) {
+  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(
-      label->font_list().DeriveWithWeight(gfx::Font::Weight::BOLD));
-
+  label->SetFontList(ResourceBundle::GetSharedInstance().GetFontListWithDelta(
+      ui::kLabelFontSizeDelta, gfx::Font::NORMAL, gfx::Font::Weight::MEDIUM));
   return label;
 }
 
 std::unique_ptr<views::View> CreateShippingOptionLabel(
     payments::mojom::PaymentShippingOption* shipping_option,
     const base::string16& formatted_amount,
     bool emphasize_label) {
   std::unique_ptr<views::View> container = base::MakeUnique<views::View>();
 
   std::unique_ptr<views::BoxLayout> layout =
       base::MakeUnique<views::BoxLayout>(views::BoxLayout::kVertical, 0, 0, 0);
   layout->set_cross_axis_alignment(
       views::BoxLayout::CROSS_AXIS_ALIGNMENT_START);
   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 =
         base::MakeUnique<views::Label>(formatted_amount);
     amount_label->SetHorizontalAlignment(gfx::ALIGN_LEFT);
     amount_label->set_id(
         static_cast<int>(DialogViewID::SHIPPING_OPTION_AMOUNT));
     container->AddChildView(amount_label.release());
   }
 
   return container;
 }
 
 }  // namespace payments