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

Unified Diff: chrome/browser/chromeos/login/network_selection_view.cc

Issue 5180002: Adjust default font sizes for new hand hinted fonts. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: introduce CROS_HAND_HINTED_FONTS define, fix oobe/login buttons, dropdowns Created 10 years, 1 month 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/chromeos/login/network_selection_view.cc
diff --git a/chrome/browser/chromeos/login/network_selection_view.cc b/chrome/browser/chromeos/login/network_selection_view.cc
index 5280d8b9b374f2883ace7bc98f2e3d21ca66f38f..02e9026b89064f3341130efb8668b5a3565cba96 100644
--- a/chrome/browser/chromeos/login/network_selection_view.cc
+++ b/chrome/browser/chromeos/login/network_selection_view.cc
@@ -23,7 +23,6 @@
#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"
@@ -61,9 +60,6 @@ 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;
@@ -92,6 +88,7 @@ static void InitMenuButtonProperties(views::MenuButton* menu_button) {
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
@@ -448,7 +445,7 @@ void NetworkSelectionView::RecreateNativeControls() {
// 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);

Powered by Google App Engine
This is Rietveld 408576698