Adjust default font sizes for new hand hinted fonts.

chrome/browser/chromeos/login/network_selection_view.cc

 // Copyright (c) 2010 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/chromeos/login/network_selection_view.h"
 
 #include <signal.h>
 #include <sys/types.h>
 #include <string>
 
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/chromeos/login/helper.h"
 #include "chrome/browser/chromeos/login/keyboard_switch_menu.h"
 #include "chrome/browser/chromeos/login/language_switch_menu.h"
 #include "chrome/browser/chromeos/login/network_screen_delegate.h"
 #include "chrome/browser/chromeos/login/proxy_settings_dialog.h"
 #include "chrome/browser/chromeos/login/rounded_rect_painter.h"
 #include "chrome/browser/chromeos/login/wizard_accessibility_helper.h"
 #include "chrome/browser/chromeos/status/network_dropdown_button.h"
 #include "gfx/size.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
-#include "views/controls/button/native_button.h"
 #include "views/controls/label.h"
 #include "views/controls/throbber.h"
 #include "views/fill_layout.h"
 #include "views/grid_layout.h"
 #include "views/standard_layout.h"
 #include "views/widget/widget.h"
 #include "views/widget/widget_gtk.h"
 #include "views/window/non_client_view.h"
 #include "views/window/window.h"
 #include "views/window/window_gtk.h"
@@ skipping 17 matching lines @@
   CONTENTS_ROW,
 };
 
 // Grid layout constants.
 const int kBorderSize = 10;
 const int kWelcomeTitlePadding = 10;
 const int kPaddingColumnWidth = 55;
 const int kMediumPaddingColumnWidth = 20;
 const int kControlPaddingRow = 15;
 
-// Size to add to the welcome title font.
-const int kWelcomeTitleFontDelta = 5;
-
 // Fixed size for language/keyboard/network controls height.
 const int kSelectionBoxHeight = 29;
 
 // Menu button is drawn using our custom icons in resources. See
 // TextButtonBorder::Paint() for details. So this offset compensate
 // horizontal size, eaten by those icons.
 const int kMenuHorizontalOffset = -3;
 
 // Vertical addition to the menu window to make it appear exactly below
 // MenuButton.
 const int kMenuVerticalOffset = -1;
 
 // Offset that compensates menu width so that it matches
 // menu button visual width when being in pushed state.
 const int kMenuWidthOffset = 6;
 
 const SkColor kWelcomeColor = 0xFFCDD3D6;
 
 // Initializes menu button default properties.
 static void InitMenuButtonProperties(views::MenuButton* menu_button) {
   menu_button->SetFocusable(true);
   menu_button->SetNormalHasBorder(true);
   menu_button->SetEnabledColor(SK_ColorBLACK);
   menu_button->SetHighlightColor(SK_ColorBLACK);
   menu_button->SetHoverColor(SK_ColorBLACK);
   menu_button->set_animate_on_state_change(false);
   // Menu is positioned by bottom right corner of the MenuButton.
   menu_button->set_menu_offset(kMenuHorizontalOffset, kMenuVerticalOffset);
+  chromeos::CorrectMenuButtonFontSize(menu_button);
 }
 
 }  // namespace
 
 namespace chromeos {
 
 // NetworkDropdownButton with custom Activate() behavior.
 class NetworkControlReportOnActivate : public NetworkDropdownButton {
  public:
   NetworkControlReportOnActivate(bool browser_mode,
@@ skipping 336 matching lines @@
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // NetworkSelectionView, private:
 
 void NetworkSelectionView::RecreateNativeControls() {
   // There is no way to get native button preferred size after the button was
   // sized so delete and recreate the button on text update.
   bool is_continue_enabled = IsContinueEnabled();
   delete continue_button_;
-  continue_button_ = new views::NativeButton(
+  continue_button_ = new login::WideButton(
       delegate_,
       l10n_util::GetString(IDS_NETWORK_SELECTION_CONTINUE_BUTTON));
   continue_button_->SetEnabled(is_continue_enabled);
 }
 
 void NetworkSelectionView::UpdateConnectingNetworkLabel() {
   connecting_network_label_->SetText(l10n_util::GetStringF(
       IDS_NETWORK_SELECTION_CONNECTING, UTF16ToWide(network_id_)));
 }
 
 }  // namespace chromeos