Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(905)

Unified Diff: chrome/browser/ui/views/payments/editor_view_controller.cc

Issue 2899653002: Remove uses of FontList::Derive*(..) in views payments dialogs. (Closed)
Patch Set: hate you gcc Created 3 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/views/payments/editor_view_controller.cc
diff --git a/chrome/browser/ui/views/payments/editor_view_controller.cc b/chrome/browser/ui/views/payments/editor_view_controller.cc
index 809aaaa58f8ed7acc82da6a99b0c78c9f36215f9..46c6070774d2699734504c27b278d8ad47207602 100644
--- a/chrome/browser/ui/views/payments/editor_view_controller.cc
+++ b/chrome/browser/ui/views/payments/editor_view_controller.cc
@@ -11,6 +11,7 @@
#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.h"
#include "chrome/browser/ui/views/payments/payment_request_dialog_view_ids.h"
#include "chrome/browser/ui/views/payments/payment_request_views_util.h"
@@ -61,11 +62,9 @@ std::unique_ptr<views::View> CreateErrorLabelView(
view->SetLayoutManager(layout.release());
std::unique_ptr<views::Label> error_label =
- base::MakeUnique<views::Label>(error);
+ base::MakeUnique<views::Label>(error, CONTEXT_DEPRECATED_SMALL);
error_label->set_id(static_cast<int>(DialogViewID::ERROR_LABEL_OFFSET) +
type);
- error_label->SetFontList(
- error_label->GetDefaultFontList().DeriveWithSizeDelta(-1));
error_label->SetEnabledColor(error_label->GetNativeTheme()->GetSystemColor(
ui::NativeTheme::kColorId_AlertSeverityHigh));
« no previous file with comments | « chrome/browser/ui/test/test_browser_dialog.cc ('k') | chrome/browser/ui/views/payments/order_summary_view_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698