[cros] Use WideButton for all screens, increase textfield vmargin on login screen.

BUG=chromium-os:8101
TEST=Manual.

Review URL: http://codereview.chromium.org/5338002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@67123 0039d316-1c4b-4281-b951-d872f2087c98

chrome/browser/chromeos/login/eula_view.cc

@@ -37,7 +37,6 @@
 #include "grit/locale_settings.h"
 #include "grit/theme_resources.h"
 #include "views/controls/button/checkbox.h"
-#include "views/controls/button/native_button.h"
 #include "views/controls/label.h"
 #include "views/controls/throbber.h"
 #include "views/grid_layout.h"
@@ -394,10 +393,10 @@ void EulaView::Init() {
 
   layout->AddView(system_security_settings_link_);
 
-  back_button_ = new views::NativeButton(this, std::wstring());
+  back_button_ = new login::WideButton(this, std::wstring());
   layout->AddView(back_button_);
 
-  continue_button_ = new views::NativeButton(this, std::wstring());
+  continue_button_ = new login::WideButton(this, std::wstring());
   layout->AddView(continue_button_);
   layout->AddPaddingRow(0, kPadding);
 

chrome/browser/chromeos/login/helper.cc

@@ -10,6 +10,7 @@
 #include "googleurl/src/gurl.h"
 #include "grit/theme_resources.h"
 #include "third_party/skia/include/effects/SkGradientShader.h"
+#include "views/controls/button/menu_button.h"
 #include "views/controls/button/native_button.h"
 #include "views/controls/label.h"
 #include "views/controls/textfield/textfield.h"
@@ -102,6 +103,11 @@ void CorrectLabelFontSize(views::Label* label) {
     label->SetFont(label->font().DeriveFont(kFontSizeCorrectionDelta));
 }
 
+void CorrectMenuButtonFontSize(views::MenuButton* button) {
+  if (button)
+    button->SetFont(button->font().DeriveFont(kFontSizeCorrectionDelta));
+}
+
 void CorrectNativeButtonFontSize(views::NativeButton* button) {
   if (button)
     button->set_font(button->font().DeriveFont(kFontSizeCorrectionDelta));
@@ -123,6 +129,7 @@ const int kButtonMinWidth = 90;
 
 gfx::Size WideButton::GetPreferredSize() {
   gfx::Size preferred_size = NativeButton::GetPreferredSize();
+  // Set minimal width.
   if (preferred_size.width() < kButtonMinWidth)
     preferred_size.set_width(kButtonMinWidth);
   return preferred_size;

chrome/browser/chromeos/login/helper.h

@@ -20,6 +20,7 @@ class Size;
 
 namespace views {
 class Label;
+class MenuButton;
 class Painter;
 class Textfield;
 class Throbber;
@@ -44,6 +45,9 @@ gfx::Rect CalculateScreenBounds(const gfx::Size& size);
 // Corrects font size for Label control.
 void CorrectLabelFontSize(views::Label* label);
 
+// Corrects font size for MenuButton control.
+void CorrectMenuButtonFontSize(views::MenuButton* button);
+
 // Corrects font size for NativeButton control.
 void CorrectNativeButtonFontSize(views::NativeButton* button);
 

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"
@@ -89,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
@@ -445,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);

chrome/browser/chromeos/login/textfield_with_margin.cc

@@ -9,13 +9,20 @@ namespace {
 // Holds ratio of the margin to the preferred text height.
 const double kTextMarginRate = 0.33;
 
+// Size of each vertical margin (top, bottom).
+const int kVerticalMargin = 3;
+
 }  // namespace
 
 namespace chromeos {
 
+TextfieldWithMargin::TextfieldWithMargin() {
+}
+
 void TextfieldWithMargin::Layout() {
   int margin = GetPreferredSize().height() * kTextMarginRate;
   SetHorizontalMargins(margin, margin);
+  SetVerticalMargins(kVerticalMargin, kVerticalMargin);
   views::Textfield::Layout();
 }
 

chrome/browser/chromeos/login/textfield_with_margin.h

@@ -14,7 +14,7 @@ namespace chromeos {
 // height.
 class TextfieldWithMargin : public views::Textfield {
  public:
-  TextfieldWithMargin() {};
+  TextfieldWithMargin();
 
   explicit TextfieldWithMargin(views::Textfield::StyleFlags style)
       : Textfield(style) {}

views/controls/button/text_button.h

@@ -138,6 +138,9 @@ class TextButton : public CustomButton {
 
   void set_max_width(int max_width) { max_width_ = max_width; }
   void SetFont(const gfx::Font& font);
+  // Return the font used by this button.
+  gfx::Font font() const { return font_; }
+
   void SetEnabledColor(SkColor color);
   void SetDisabledColor(SkColor color);
   void SetHighlightColor(SkColor color);