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

chrome/browser/ui/views/password_generation_bubble_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/password_generation_bubble_view.h"
 
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/autofill/password_generator.h"
 #include "chrome/browser/password_manager/password_manager.h"
 #include "chrome/browser/ui/browser.h"
@@ skipping 17 matching lines @@
 #include "ui/views/controls/link.h"
 #include "ui/views/controls/textfield/textfield.h"
 #include "ui/views/layout/layout_constants.h"
 
 namespace {
 // Constants for PasswordGenerationBubbleView.
 const int kBubbleMargin = 9;
 const int kButtonHorizontalSpacing = 4;
 const int kButtonWidth = 65;
 const int kDefaultTextFieldChars = 18;
-const int kTitleLabelVerticalOffset = -3;
+const int kTitleLabelVerticalOffset = -1;
 const int kVerticalPadding = 8;
 
 // Constants for Text fieldWrapper.
 const int kTextfieldHorizontalPadding = 2;
 const int kTextfieldVerticalPadding = 3;
 const int kWrapperBorderSize = 1;
 
 // This class handles layout so that it looks like a Textfield and ImageButton
 // are part of one logical textfield with the button on the right side of the
 // field. It also assumes that the textfield is already sized appropriately
@@ skipping 92 matching lines @@
       theme_provider_(theme_provider) {}
 
 PasswordGenerationBubbleView::~PasswordGenerationBubbleView() {}
 
 void PasswordGenerationBubbleView::Init() {
   set_margins(gfx::Insets(kBubbleMargin, kBubbleMargin,
                           kBubbleMargin, kBubbleMargin));
 
   // TODO(gcasto): Localize text after we have finalized the UI.
   // crbug.com/118062.
-  gfx::Font label_font =
-      ResourceBundle::GetSharedInstance().GetFont(ResourceBundle::BaseFont);
-  label_font = label_font.DeriveFont(2);
+  ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
   title_label_ = new views::Label(ASCIIToUTF16("Password Suggestion"),
-                                  label_font);
+                                  rb.GetFont(ui::ResourceBundle::MediumFont));
   AddChildView(title_label_);
 
   regenerate_button_ = new views::ImageButton(this);
   regenerate_button_->SetImage(
       views::CustomButton::STATE_NORMAL,
       theme_provider_->GetImageSkiaNamed(IDR_RELOAD_DIMMED));
   regenerate_button_->SetImage(
       views::CustomButton::STATE_HOVERED,
       theme_provider_->GetImageSkiaNamed(IDR_RELOAD));
   regenerate_button_->SetImage(
       views::CustomButton::STATE_PRESSED,
       theme_provider_->GetImageSkiaNamed(IDR_RELOAD));
 
   textfield_ = new views::Textfield();
-  gfx::Font textfield_font =
-      ResourceBundle::GetSharedInstance().GetFont(ResourceBundle::BaseFont);
-  textfield_font = textfield_font.DeriveFont(2, gfx::Font::BOLD);
-  textfield_->SetFont(textfield_font);
   textfield_->set_default_width_in_chars(kDefaultTextFieldChars);
   textfield_->SetText(ASCIIToUTF16(password_generator_->Generate()));
 
   textfield_wrapper_ = new TextfieldWrapper(textfield_,
                                             regenerate_button_);
   AddChildView(textfield_wrapper_);
 
   accept_button_ = new views::NativeTextButton(this,
                                                ASCIIToUTF16("Try it"));
   AddChildView(accept_button_);
@@ skipping 42 matching lines @@
   }
   if (sender == regenerate_button_) {
     textfield_->SetText(
         ASCIIToUTF16(password_generator_->Generate()));
   }
 }
 
 views::View* PasswordGenerationBubbleView::GetInitiallyFocusedView() {
   return textfield_;
 }