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

Unified Diff: chrome/browser/ui/views/extensions/extension_install_dialog_view.cc

Issue 2734113006: "Bootstrap" a toolkit-views Typography spec. (Closed)
Patch Set: Rebase (conflict in layout_delegate.h due to r457774) Created 3 years, 9 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/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..55705ccb927b4cf95c09f0184ca2158d2c5fe262 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_text_context, user_count_text_context;
+ if (LayoutDelegate::Get()->IsHarmonyMode()) {
+ rating_text_context = CONTEXT_BODY_TEXT_LARGE;
+ user_count_text_context = CONTEXT_BODY_TEXT_SMALL;
+ } else {
+ rating_text_context = user_count_text_context = CONTEXT_DEPRECATED_SMALL;
+ }
views::Label* rating_count =
- new views::Label(prompt_->GetRatingCount(), small_font_list);
+ new views::Label(prompt_->GetRatingCount(), rating_text_context,
+ views::style::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_text_context, 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::style::CONTEXT_DIALOG_TITLE);
title->SetMultiLine(true);
title->SetHorizontalAlignment(gfx::ALIGN_LEFT);
title->SizeToFit(left_column_width);

Powered by Google App Engine
This is Rietveld 408576698