Remove views::Label::SetDisabledColor(). Replace with typography colors.

chrome/browser/ui/views/payments/payment_sheet_view_controller.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_sheet_view_controller.h"
 
 #include <algorithm>
 #include <memory>
 #include <string>
 #include <utility>
 #include <vector>
 
 #include "base/i18n/message_formatter.h"
 #include "base/macros.h"
 #include "base/memory/ptr_util.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/chrome_pages.h"
+#include "chrome/browser/ui/views/harmony/chrome_typography.h"
 #include "chrome/browser/ui/views/payments/payment_request_dialog_view.h"
 #include "chrome/browser/ui/views/payments/payment_request_dialog_view_ids.h"
 #include "chrome/browser/ui/views/payments/payment_request_row_view.h"
 #include "chrome/browser/ui/views/payments/payment_request_views_util.h"
 #include "chrome/grit/generated_resources.h"
 #include "components/autofill/core/browser/field_types.h"
 #include "components/autofill/core/browser/personal_data_manager.h"
 #include "components/payments/content/payment_request_spec.h"
 #include "components/payments/content/payment_request_state.h"
 #include "components/payments/core/currency_formatter.h"
@@ skipping 45 matching lines @@
 // A class that ensures proper elision of labels in the form
 // "[preview] and N more" where preview might be elided to allow "and N more" to
 // be always visible.
 class PreviewEliderLabel : public views::Label {
  public:
   // Creates a PreviewEliderLabel where |preview_text| might be elided,
   // |format_string| is the string with format argument numbers in ICU syntax
   // and |n| is the "N more" item count.
   PreviewEliderLabel(const base::string16& preview_text,
                      const base::string16& format_string,
-                     int n)
-      : views::Label(base::string16()),
+                     int n,
+                     int text_style)
+      : views::Label(base::string16(), views::style::CONTEXT_LABEL, text_style),
         preview_text_(preview_text),
         format_string_(format_string),
         n_(n) {}
 
  private:
   // Formats |preview_text_|, |format_string_|, and |n_| into a string that fits
   // inside of |pixel_width|, eliding |preview_text_| as required.
   base::string16 CreateElidedString(int pixel_width) {
     for (int preview_length = preview_text_.size(); preview_length > 0;
          --preview_length) {
@@ skipping 87 matching lines @@
   }
 
   layout->AddView(trailing_button.release());
 
   return std::move(row);
 }
 
 std::unique_ptr<views::View> CreateInlineCurrencyAmountItem(
     const base::string16& currency,
     const base::string16& amount,
-    bool disabled_color,
+    bool hint_color,
     bool bold) {
   std::unique_ptr<views::View> item_amount_line =
       base::MakeUnique<views::View>();
   std::unique_ptr<views::GridLayout> item_amount_layout =
       base::MakeUnique<views::GridLayout>(item_amount_line.get());
   views::ColumnSet* item_amount_columns = item_amount_layout->AddColumnSet(0);
   item_amount_columns->AddColumn(views::GridLayout::LEADING,
                                  views::GridLayout::LEADING, 0,
                                  views::GridLayout::USE_PREF, 0, 0);
   item_amount_columns->AddColumn(views::GridLayout::TRAILING,
                                  views::GridLayout::LEADING, 1,
                                  views::GridLayout::USE_PREF, 0, 0);
 
+  DCHECK(!bold || !hint_color);
   std::unique_ptr<views::Label> currency_label =
       bold ? CreateBoldLabel(currency)
-           : base::MakeUnique<views::Label>(currency);
-  if (disabled_color) {
-    currency_label->SetDisabledColor(
-        currency_label->GetNativeTheme()->GetSystemColor(
-            ui::NativeTheme::kColorId_LabelDisabledColor));
-    currency_label->SetEnabled(false);
-  }
+           : (hint_color ? CreateHintLabel(currency)
+                         : base::MakeUnique<views::Label>(currency));

[Peter Kasting, 2017/06/01 04:55:58]

Nit: Nesting ?:s makes me unhappy.

[tapted, 2017/06/01 11:22:18]

Done.

   std::unique_ptr<views::Label> amount_label =
       bold ? CreateBoldLabel(amount) : base::MakeUnique<views::Label>(amount);
   amount_label->SetMultiLine(true);
   amount_label->SetAllowCharacterBreak(true);
 
   item_amount_layout->StartRow(0, 0);
   item_amount_layout->AddView(currency_label.release());
   item_amount_layout->AddView(amount_label.release());
 
   item_amount_line->SetLayoutManager(item_amount_layout.release());
@@ skipping 51 matching lines @@
 
   // Creates a row with a button in place of the chevron and |truncated_content|
   // between |section_name| and the button.
   // +------------------------------------------+
   // | Name | truncated_content | button_string |
   // +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~+
   std::unique_ptr<views::Button> CreateWithButton(
       const base::string16& truncated_content,
       const base::string16& button_string,
       bool button_enabled) {
-    std::unique_ptr<views::Label> content_view =
-        base::MakeUnique<views::Label>(truncated_content);
-    content_view->SetHorizontalAlignment(gfx::ALIGN_LEFT);
-    content_view->SetDisabledColor(
-        content_view->GetNativeTheme()->GetSystemColor(
-            ui::NativeTheme::kColorId_LabelDisabledColor));
-    content_view->SetEnabled(false);
-    return CreateWithButton(std::move(content_view), button_string,
-                            button_enabled);
+    return CreateWithButton(CreateHintLabel(truncated_content, gfx::ALIGN_LEFT),
+                            button_string, button_enabled);
   }
 
   // Creates a row with a button in place of the chevron with the string between
   // |section_name| and the button built as "|preview|... and |n| more".
   // |format_string| is used to assemble the truncated preview and the rest of
   // the content string.
   // +----------------------------------------------+
   // | Name | preview... and N more | button_string |
   // +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~+
   std::unique_ptr<views::Button> CreateWithButton(
       const base::string16& preview_text,
       const base::string16& format_string,
       int n,
       const base::string16& button_string,
       bool button_enabled) {
     std::unique_ptr<PreviewEliderLabel> content_view =
-        base::MakeUnique<PreviewEliderLabel>(preview_text, format_string, n);
+        base::MakeUnique<PreviewEliderLabel>(preview_text, format_string, n,
+                                             STYLE_HINT);
     content_view->SetHorizontalAlignment(gfx::ALIGN_LEFT);
-    content_view->SetDisabledColor(
-        content_view->GetNativeTheme()->GetSystemColor(
-            ui::NativeTheme::kColorId_LabelDisabledColor));
-    content_view->SetEnabled(false);
     return CreateWithButton(std::move(content_view), button_string,
                             button_enabled);
   }
 
  private:
   // Creates a row with a button in place of the chevron.
   // +------------------------------------------+
   // | Name | content_view      | button_string |
   // +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~+
   std::unique_ptr<views::Button> CreateWithButton(
@@ skipping 216 matching lines @@
   bool is_mixed_currency = spec()->IsMixedCurrency();
   // The inline items section contains the first 2 display items of the
   // request's details, followed by a label indicating "N more items..." if
   // there are more than 2 items in the details. The total label and amount
   // always follow.
   constexpr int kMaxNumberOfItemsShown = 2;
   int hidden_item_count = items.size() - kMaxNumberOfItemsShown;
   if (hidden_item_count > 0) {
     layout->StartRow(0, 0);
     std::unique_ptr<views::Label> label =
-        base::MakeUnique<views::Label>(l10n_util::GetPluralStringFUTF16(
+        CreateHintLabel(l10n_util::GetPluralStringFUTF16(
             IDS_PAYMENT_REQUEST_ORDER_SUMMARY_MORE_ITEMS, hidden_item_count));
-    label->SetDisabledColor(label->GetNativeTheme()->GetSystemColor(
-        ui::NativeTheme::kColorId_LabelDisabledColor));
-    label->SetEnabled(false);
     layout->AddView(label.release());
     if (is_mixed_currency) {
       std::unique_ptr<views::Label> multiple_currency_label =
-          base::MakeUnique<views::Label>(l10n_util::GetStringUTF16(
+          CreateHintLabel(l10n_util::GetStringUTF16(
               IDS_PAYMENT_REQUEST_ORDER_SUMMARY_MULTIPLE_CURRENCY_INDICATOR));
-      multiple_currency_label->SetDisabledColor(
-          multiple_currency_label->GetNativeTheme()->GetSystemColor(
-              ui::NativeTheme::kColorId_LabelDisabledColor));
-      multiple_currency_label->SetEnabled(false);
       layout->AddView(multiple_currency_label.release());
     }
   }
 
   for (size_t i = 0; i < items.size() && i < kMaxNumberOfItemsShown; ++i) {
     layout->StartRow(0, 0);
     std::unique_ptr<views::Label> summary =
         base::MakeUnique<views::Label>(base::UTF8ToUTF16(items[i]->label));
     summary->SetHorizontalAlignment(gfx::ALIGN_LEFT);
     layout->AddView(summary.release());
@@ skipping 345 matching lines @@
   data_source_label->SetDefaultStyle(default_style);
   data_source_label->AddStyleRange(
       gfx::Range(link_begin, link_begin + link_length),
       views::StyledLabel::RangeStyleInfo::CreateForLink());
   data_source_label->SizeToFit(0);
   content_view->AddChildView(data_source_label.release());
   return content_view;
 }
 
 }  // namespace payments