Adjust fonts (part of 137349): use standard font sizes in chrome/browser/ui/views

chrome/browser/ui/views/extensions/extension_install_dialog_view.cc

 // Copyright (c) 2012 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 <vector>
 
 #include "base/basictypes.h"
 #include "base/command_line.h"
 #include "base/compiler_specific.h"
 #include "base/i18n/rtl.h"
@@ skipping 53 matching lines @@
 const int kNoPermissionsLeftColumnWidth = 200;
 
 // Width of the left column for bundle install prompts. There's only one column
 // in this case, so make it wider than normal.
 const int kBundleLeftColumnWidth = 300;
 
 // Width of the left column for external install prompts. The text is long in
 // this case, so make it wider than normal.
 const int kExternalInstallLeftColumnWidth = 350;
 
-// Heading font size correction.
-const int kHeadingFontSizeDelta = 1;
-
-const int kRatingFontSizeDelta = -1;
-
 void AddResourceIcon(const gfx::ImageSkia* skia_image, void* data) {
   views::View* parent = static_cast<views::View*>(data);
   views::ImageView* image_view = new views::ImageView();
   image_view->SetImage(*skia_image);
   parent->AddChildView(image_view);
 }
 
 // Creates a string for displaying |message| to the user. If it has to look
 // like a entry in a bullet point list, one is added.
 string16 PrepareForDisplay(const string16& message, bool bullet_point) {
@@ skipping 255 matching lines @@
     column_set->AddColumn(views::GridLayout::LEADING,
                           views::GridLayout::LEADING,
                           0,  // no resizing
                           views::GridLayout::USE_PREF,
                           0,  // no fixed width
                           kIconSize);
   }
 
   layout->StartRow(0, column_set_id);
 
+  ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
+
   views::Label* heading = new views::Label(prompt.GetHeading());
-  heading->SetFont(heading->font().DeriveFont(kHeadingFontSizeDelta,
-                                              gfx::Font::BOLD));
+  heading->SetFont(rb.GetFont(ui::ResourceBundle::MediumFont));
   heading->SetMultiLine(true);
   heading->SetHorizontalAlignment(gfx::ALIGN_LEFT);
   heading->SizeToFit(left_column_width);
   layout->AddView(heading);
 
   if (!is_bundle_install()) {
     // Scale down to icon size, but allow smaller icons (don't scale up).
     const gfx::ImageSkia* image = prompt.icon().ToImageSkia();
     gfx::Size size(image->width(), image->height());
     if (size.width() > kIconSize || size.height() > kIconSize)
@@ skipping 21 matching lines @@
 
   if (is_inline_install()) {
     layout->StartRow(0, column_set_id);
     views::View* rating = new views::View();
     rating->SetLayoutManager(new views::BoxLayout(
         views::BoxLayout::kHorizontal, 0, 0, 0));
     layout->AddView(rating);
     prompt.AppendRatingStars(AddResourceIcon, rating);
 
     views::Label* rating_count = new views::Label(prompt.GetRatingCount());
-    rating_count->SetFont(
-        rating_count->font().DeriveFont(kRatingFontSizeDelta));
+    rating_count->SetFont(rb.GetFont(ui::ResourceBundle::SmallFont));
     // Add some space between the stars and the rating count.
     rating_count->set_border(views::Border::CreateEmptyBorder(0, 2, 0, 0));
     rating->AddChildView(rating_count);
 
     layout->StartRow(0, column_set_id);
     views::Label* user_count = new views::Label(prompt.GetUserCount());
     user_count->SetAutoColorReadabilityEnabled(false);
     user_count->SetEnabledColor(SK_ColorGRAY);
-    user_count->SetFont(user_count->font().DeriveFont(kRatingFontSizeDelta));
+    user_count->SetFont(rb.GetFont(ui::ResourceBundle::SmallFont));
     layout->AddView(user_count);
 
     layout->StartRow(0, column_set_id);
     views::Link* store_link = new views::Link(
         l10n_util::GetStringUTF16(IDS_EXTENSION_PROMPT_STORE_LINK));
-    store_link->SetFont(store_link->font().DeriveFont(kRatingFontSizeDelta));
+    store_link->SetFont(rb.GetFont(ui::ResourceBundle::SmallFont));
     store_link->set_listener(this);
     layout->AddView(store_link);
   }
 
   if (is_bundle_install()) {
     BundleInstaller::ItemList items = prompt_.bundle()->GetItemsWithState(
         BundleInstaller::Item::STATE_PENDING);
     for (size_t i = 0; i < items.size(); ++i) {
       string16 extension_name = UTF8ToUTF16(items[i].localized_name);
       base::i18n::AdjustStringForLocaleDirection(&extension_name);
@@ skipping 14 matching lines @@
     if (is_inline_install()) {
       layout->StartRow(0, column_set_id);
       layout->AddView(new views::Separator(), 3, 1, views::GridLayout::FILL,
                       views::GridLayout::FILL);
       layout->AddPaddingRow(0, views::kRelatedControlVerticalSpacing);
     }
 
     layout->StartRow(0, column_set_id);
     views::Label* permissions_header = NULL;
     if (is_bundle_install()) {
-      // We need to make the font bold like this, rather than using SetFont,
-      // because otherwise SizeToFit mis-judges the width of the line.
-      gfx::Font bold_font = ui::ResourceBundle::GetSharedInstance().GetFont(
-          ui::ResourceBundle::BaseFont).DeriveFont(
-              kHeadingFontSizeDelta, gfx::Font::BOLD);
+      // We need to pass the Font in the constructor, rather than calling
+      // SetFont later, because otherwise SizeToFit mis-judges the width
+      // of the line.
       permissions_header = new views::Label(
-          prompt.GetPermissionsHeading(), bold_font);
+          prompt.GetPermissionsHeading(),
+          rb.GetFont(ui::ResourceBundle::MediumFont));
     } else {
       permissions_header = new views::Label(prompt.GetPermissionsHeading());
     }
     permissions_header->SetMultiLine(true);
     permissions_header->SetHorizontalAlignment(gfx::ALIGN_LEFT);
     permissions_header->SizeToFit(left_column_width);
     layout->AddView(permissions_header);
 
     for (size_t i = 0; i < prompt.GetPermissionCount(); ++i) {
       layout->AddPaddingRow(0, views::kRelatedControlVerticalSpacing);
@@ skipping 51 matching lines @@
                           views::GridLayout::FILL,
                           1,
                           views::GridLayout::USE_PREF,
                           0,  // no fixed width
                           left_column_width + kIconSize);
     layout->StartRowWithPadding(0, column_set_id,
                                 0, views::kRelatedControlVerticalSpacing);
     app_launcher_opt_in_checkbox_ = new views::Checkbox(
         l10n_util::GetStringUTF16(IDS_APP_LIST_OPT_IN_TEXT));
     app_launcher_opt_in_checkbox_->SetFont(
-        app_launcher_opt_in_checkbox_->font().DeriveFont(0, gfx::Font::BOLD));
+        rb.GetFont(ui::ResourceBundle::BoldFont));
     layout->AddView(app_launcher_opt_in_checkbox_);
   }
 }
 
 ExtensionInstallDialogView::~ExtensionInstallDialogView() {}
 
 void ExtensionInstallDialogView::SizeToContents() {
   GetWidget()->SetSize(GetWidget()->non_client_view()->GetPreferredSize());
 }
 
@@ skipping 181 matching lines @@
       rotate.Translate(-arrow_view_->width() / 2.0,
                        -arrow_view_->height() / 2.0);
     }
     arrow_view_->SetTransform(rotate);
   }
 }
 
 void IssueAdviceView::ChildPreferredSizeChanged(views::View* child) {
   owner_->SizeToContents();
 }