Add views::Button style enum for LabelButton [native] styling, etc.

Add Button::ButtonStyle enum for existing [native] LabelButton styles.
Add ButtonStyle member and accessors (or ctor arg) to LabelButton[Border].
These replace LabelButton[Border] native_style flag, will support more later. 

Add LabelButton::kViewClassName, use for manual RTTI in a DCHECK.
Move CustomButton::ButtonState to Button; update some usage.
Other minor cleanup and refactoring.

This should facilitate implementation and use of other LabelButton styles/types:
TODO(followup): Add toggled state for checkboxes, radio buttons, etc.
TODO(followup): Add Styles: "Chrome Style", Checkbox, Radio, Menu, ComboBox, etc.
(each style probably just needs to set some IDRs/colors/insets/etc. on LabelButton)

BUG=155363
TEST=No observable Views Button changes.
R=sky@chromium.org 
NOTRY=true
(added notry for weird concatenated linux_rel step "browser_testsnet_unittests")

Review URL: https://chromiumcodereview.appspot.com/12330002

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

3 files changed, 20 insertions, 18 deletions

diff --git a/ash/system/logout_button/tray_logout_button.cc b/ash/system/logout_button/tray_logout_button.cc
index 73a6a83..e162347 100644
--- a/ash/system/logout_button/tray_logout_button.cc
+++ b/ash/system/logout_button/tray_logout_button.cc
@@ -80,17 +80,18 @@ class LogoutButton : public views::View,
         0, kTrayLabelItemHorizontalPaddingBottomAlignment, 0, 0));
 
     button_ = new views::LabelButton(this, string16());
-    for (size_t state = 0; state < views::CustomButton::STATE_COUNT; ++state) {
+    for (size_t state = 0; state < views::Button::STATE_COUNT; ++state) {
       button_->SetTextColor(
-          static_cast<views::CustomButton::ButtonState>(state), SK_ColorWHITE);
+          static_cast<views::Button::ButtonState>(state), SK_ColorWHITE);
     }
     button_->SetFont(button_->GetFont().DeriveFont(1));
-    views::LabelButtonBorder* border = new views::LabelButtonBorder();
-    border->SetPainter(views::CustomButton::STATE_NORMAL,
+    views::LabelButtonBorder* border =
+        new views::LabelButtonBorder(views::Button::STYLE_TEXTBUTTON);
+    border->SetPainter(views::Button::STATE_NORMAL,
         views::Painter::CreateImageGridPainter(kLogoutButtonNormalImages));
-    border->SetPainter(views::CustomButton::STATE_HOVERED,
+    border->SetPainter(views::Button::STATE_HOVERED,
         views::Painter::CreateImageGridPainter(kLogoutButtonHotImages));
-    border->SetPainter(views::CustomButton::STATE_PRESSED,
+    border->SetPainter(views::Button::STATE_PRESSED,
         views::Painter::CreateImageGridPainter(kLogoutButtonPushedImages));
     button_->set_border(border);
     AddChildView(button_);
diff --git a/ash/system/tray/tray_views.cc b/ash/system/tray/tray_views.cc
index 6065d34..6e2d292 100644
--- a/ash/system/tray/tray_views.cc
+++ b/ash/system/tray/tray_views.cc
@@ -145,17 +145,18 @@ void FixedSizedScrollView::OnPaintFocusBorder(gfx::Canvas* canvas) {
 ////////////////////////////////////////////////////////////////////////////////
 // TrayPopupLabelButtonBorder
 
-TrayPopupLabelButtonBorder::TrayPopupLabelButtonBorder() {
-  SetPainter(views::CustomButton::STATE_NORMAL,
+TrayPopupLabelButtonBorder::TrayPopupLabelButtonBorder()
+    : LabelButtonBorder(views::Button::STYLE_TEXTBUTTON) {
+  SetPainter(views::Button::STATE_NORMAL,
              views::Painter::CreateImageGridPainter(
                  kTrayPopupLabelButtonBorderImagesNormal));
-  SetPainter(views::CustomButton::STATE_DISABLED,
+  SetPainter(views::Button::STATE_DISABLED,
              views::Painter::CreateImageGridPainter(
                  kTrayPopupLabelButtonBorderImagesNormal));
-  SetPainter(views::CustomButton::STATE_HOVERED,
+  SetPainter(views::Button::STATE_HOVERED,
              views::Painter::CreateImageGridPainter(
                  kTrayPopupLabelButtonBorderImagesHovered));
-  SetPainter(views::CustomButton::STATE_PRESSED,
+  SetPainter(views::Button::STATE_PRESSED,
              views::Painter::CreateImageGridPainter(
                  kTrayPopupLabelButtonBorderImagesHovered));
 }
@@ -236,13 +237,13 @@ TrayPopupHeaderButton::TrayPopupHeaderButton(views::ButtonListener* listener,
                                              int accessible_name_id)
     : views::ToggleImageButton(listener) {
   ui::ResourceBundle& bundle = ui::ResourceBundle::GetSharedInstance();
-  SetImage(views::CustomButton::STATE_NORMAL,
+  SetImage(views::Button::STATE_NORMAL,
       bundle.GetImageNamed(enabled_resource_id).ToImageSkia());
-  SetToggledImage(views::CustomButton::STATE_NORMAL,
+  SetToggledImage(views::Button::STATE_NORMAL,
       bundle.GetImageNamed(disabled_resource_id).ToImageSkia());
-  SetImage(views::CustomButton::STATE_HOVERED,
+  SetImage(views::Button::STATE_HOVERED,
       bundle.GetImageNamed(enabled_resource_id_hover).ToImageSkia());
-  SetToggledImage(views::CustomButton::STATE_HOVERED,
+  SetToggledImage(views::Button::STATE_HOVERED,
       bundle.GetImageNamed(disabled_resource_id_hover).ToImageSkia());
   SetImageAlignment(views::ImageButton::ALIGN_CENTER,
                     views::ImageButton::ALIGN_MIDDLE);
diff --git a/ash/system/user/tray_user.cc b/ash/system/user/tray_user.cc
index b7564bd..44a093e 100644
--- a/ash/system/user/tray_user.cc
+++ b/ash/system/user/tray_user.cc
@@ -487,13 +487,13 @@ void UserView::AddLogoutButton(ash::user::LoginStatus login) {
   if (login == ash::user::LOGGED_IN_PUBLIC) {
     TrayPopupLabelButtonBorder* border =
         static_cast<TrayPopupLabelButtonBorder*>(logout_button_->border());
-    border->SetPainter(views::CustomButton::STATE_NORMAL,
+    border->SetPainter(views::Button::STATE_NORMAL,
                        views::Painter::CreateImageGridPainter(
                            kPublicAccountLogoutButtonBorderImagesNormal));
-    border->SetPainter(views::CustomButton::STATE_HOVERED,
+    border->SetPainter(views::Button::STATE_HOVERED,
                        views::Painter::CreateImageGridPainter(
                            kPublicAccountLogoutButtonBorderImagesHovered));
-    border->SetPainter(views::CustomButton::STATE_PRESSED,
+    border->SetPainter(views::Button::STATE_PRESSED,
                        views::Painter::CreateImageGridPainter(
                            kPublicAccountLogoutButtonBorderImagesHovered));
   }