Chromium Code Reviews| Index: chrome/browser/ui/views/extensions/extension_install_dialog_view.cc |
| diff --git a/chrome/browser/ui/views/extensions/extension_install_dialog_view.cc b/chrome/browser/ui/views/extensions/extension_install_dialog_view.cc |
| index 4ccf6d36576cb67b477d04dec83f4388c0a3df68..8678d5c1269421810de5eff51921ef07e40881ef 100644 |
| --- a/chrome/browser/ui/views/extensions/extension_install_dialog_view.cc |
| +++ b/chrome/browser/ui/views/extensions/extension_install_dialog_view.cc |
| @@ -25,6 +25,7 @@ |
| #include "chrome/browser/profiles/profile.h" |
| #include "chrome/browser/ui/browser.h" |
| #include "chrome/browser/ui/scoped_tabbed_browser_displayer.h" |
| +#include "chrome/browser/ui/views/harmony/chrome_typography.h" |
| #include "chrome/browser/ui/views/harmony/layout_delegate.h" |
| #include "chrome/common/extensions/extension_constants.h" |
| #include "chrome/grit/generated_resources.h" |
| @@ -231,17 +232,23 @@ void ExtensionInstallDialogView::InitView() { |
| layout->AddView(rating); |
| prompt_->AppendRatingStars(AddResourceIcon, rating); |
| - const gfx::FontList& small_font_list = |
| - rb.GetFontList(ui::ResourceBundle::SmallFont); |
| + int rating_font, user_count_font; |
|
Peter Kasting
2017/03/17 02:25:59
Nit: Naming wise I'd prefer "context" or "text_con
tapted
2017/03/17 10:33:10
Done.
|
| + if (LayoutDelegate::Get()->IsHarmonyMode()) { |
| + rating_font = CONTEXT_DIALOG_MESSAGE; |
| + user_count_font = CONTEXT_DIALOG_TEXT_SMALL; |
| + } else { |
| + rating_font = user_count_font = CONTEXT_DEPRECATED_SMALL; |
| + } |
| views::Label* rating_count = |
| - new views::Label(prompt_->GetRatingCount(), small_font_list); |
| + new views::Label(prompt_->GetRatingCount(), rating_font, |
| + views::typography::STYLE_PRIMARY); |
| // Add some space between the stars and the rating count. |
| rating_count->SetBorder(views::CreateEmptyBorder(0, 2, 0, 0)); |
| rating->AddChildView(rating_count); |
| layout->StartRow(0, column_set_id); |
| - views::Label* user_count = |
| - new views::Label(prompt_->GetUserCount(), small_font_list); |
| + views::Label* user_count = new views::Label( |
| + prompt_->GetUserCount(), user_count_font, STYLE_SECONDARY); |
| user_count->SetAutoColorReadabilityEnabled(false); |
| user_count->SetEnabledColor(SK_ColorGRAY); |
| layout->AddView(user_count); |
| @@ -442,10 +449,8 @@ views::GridLayout* ExtensionInstallDialogView::CreateLayout( |
| column_set->AddPaddingColumn(0, views::kButtonHEdgeMarginNew); |
| layout->StartRow(0, column_set_id); |
| - views::Label* title = |
| - new views::Label(prompt_->GetDialogTitle(), |
| - ui::ResourceBundle::GetSharedInstance().GetFontList( |
| - ui::ResourceBundle::MediumFont)); |
| + views::Label* title = new views::Label( |
| + prompt_->GetDialogTitle(), views::typography::CONTEXT_DIALOG_TITLE); |
| title->SetMultiLine(true); |
| title->SetHorizontalAlignment(gfx::ALIGN_LEFT); |
| title->SizeToFit(left_column_width); |