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

chrome/browser/ui/views/sad_tab_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 "chrome/browser/ui/views/sad_tab_view.h"
 
 #include <string>
 
 #include "base/metrics/field_trial.h"
 #include "base/metrics/histogram.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/feedback/feedback_util.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_finder.h"
 #include "chrome/browser/ui/chrome_pages.h"
 #include "chrome/common/url_constants.h"
 #include "content/public/browser/navigation_controller.h"
 #include "content/public/browser/web_contents.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
-#include "ui/gfx/font.h"
 #include "ui/views/controls/button/text_button.h"
 #include "ui/views/controls/image_view.h"
 #include "ui/views/controls/label.h"
 #include "ui/views/controls/link.h"
 #include "ui/views/layout/grid_layout.h"
 
 using content::OpenURLParams;
 using content::WebContents;
 
 namespace {
 
 const int kPadding = 20;
 const float kMessageSize = 0.65f;
 const SkColor kTextColor = SK_ColorWHITE;
 const SkColor kCrashColor = SkColorSetRGB(35, 48, 64);
 const SkColor kKillColor = SkColorSetRGB(57, 48, 88);
 
 const char kCategoryTagCrash[] = "Crash";
 
-// Font size correction.
-const int kTitleFontSizeDelta = 2;
-const int kMessageFontSizeDelta = 1;
-
 // Name of the experiment to run.
 const char kExperiment[] = "LowMemoryMargin";
 
 #define EXPERIMENT_CUSTOM_COUNTS(name, sample, min, max, buckets)          \
     {                                                                      \
       UMA_HISTOGRAM_CUSTOM_COUNTS(name, sample, min, max, buckets);        \
       if (base::FieldTrialList::TrialExists(kExperiment))                  \
         UMA_HISTOGRAM_CUSTOM_COUNTS(                                       \
             base::FieldTrial::MakeName(name, kExperiment),                 \
             sample, min, max, buckets);                                    \
     }
 
 }  // namespace
 
 SadTabView::SadTabView(WebContents* web_contents, chrome::SadTabKind kind)
     : web_contents_(web_contents),
       kind_(kind),
       painted_(false),
-      base_font_(ui::ResourceBundle::GetSharedInstance().GetFont(
-          ui::ResourceBundle::BaseFont)),
       message_(NULL),
       help_link_(NULL),
       feedback_link_(NULL),
       reload_button_(NULL) {
   DCHECK(web_contents);
 
   // Sometimes the user will never see this tab, so keep track of the total
   // number of creation events to compare to display events.
   // TODO(jamescook): Remove this after R20 stable.  Keep it for now so we can
   // compare R20 to earlier versions.
@@ skipping 77 matching lines @@
 
   views::ImageView* image = new views::ImageView();
   image->SetImage(ui::ResourceBundle::GetSharedInstance().GetImageSkiaNamed(
       (kind_ == chrome::SAD_TAB_KIND_CRASHED) ? IDR_SAD_TAB : IDR_KILLED_TAB));
   layout->StartRowWithPadding(0, column_set_id, 1, kPadding);
   layout->AddView(image);
 
   views::Label* title = CreateLabel(l10n_util::GetStringUTF16(
       (kind_ == chrome::SAD_TAB_KIND_CRASHED) ?
           IDS_SAD_TAB_TITLE : IDS_KILLED_TAB_TITLE));
-  title->SetFont(base_font_.DeriveFont(kTitleFontSizeDelta, gfx::Font::BOLD));
+  ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
+  title->SetFont(rb.GetFont(ui::ResourceBundle::MediumFont));
   layout->StartRowWithPadding(0, column_set_id, 0, kPadding);
   layout->AddView(title);
 
   message_ = CreateLabel(l10n_util::GetStringUTF16(
       (kind_ == chrome::SAD_TAB_KIND_CRASHED) ?
           IDS_SAD_TAB_MESSAGE : IDS_KILLED_TAB_MESSAGE));
   message_->SetMultiLine(true);
   layout->StartRowWithPadding(0, column_set_id, 0, kPadding);
   layout->AddView(message_);
 
@@ skipping 69 matching lines @@
       default:
         NOTREACHED();
     }
     painted_ = true;
   }
   View::OnPaint(canvas);
 }
 
 views::Label* SadTabView::CreateLabel(const string16& text) {
   views::Label* label = new views::Label(text);
-  label->SetFont(base_font_.DeriveFont(kMessageFontSizeDelta));
   label->SetBackgroundColor(background()->get_color());
   label->SetEnabledColor(kTextColor);
   return label;
 }
 
 views::Link* SadTabView::CreateLink(const string16& text) {
   views::Link* link = new views::Link(text);
-  link->SetFont(base_font_.DeriveFont(kMessageFontSizeDelta));
   link->SetBackgroundColor(background()->get_color());
   link->SetEnabledColor(kTextColor);
   link->set_listener(this);
   return link;
 }