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

ash/system/tray/tray_views.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 "ash/system/tray/tray_views.h"
 
 #include "ash/ash_constants.h"
 #include "ash/system/tray/fixed_sized_image_view.h"
 #include "ash/system/tray/tray_constants.h"
 #include "ash/system/tray/tray_item_view.h"
@@ skipping 127 matching lines @@
   RequestFocus();
 }
 
 void FixedSizedScrollView::OnPaintFocusBorder(gfx::Canvas* canvas) {
   // Do not paint the focus border.
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // 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));
 }
 
 TrayPopupLabelButtonBorder::~TrayPopupLabelButtonBorder() {}
 
 void TrayPopupLabelButtonBorder::Paint(const views::View& view,
                                        gfx::Canvas* canvas) {
   const views::NativeThemeDelegate* native_theme_delegate =
       static_cast<const views::LabelButton*>(&view);
@@ skipping 60 matching lines @@
 // TrayPopupHeaderButton
 
 TrayPopupHeaderButton::TrayPopupHeaderButton(views::ButtonListener* listener,
                                              int enabled_resource_id,
                                              int disabled_resource_id,
                                              int enabled_resource_id_hover,
                                              int disabled_resource_id_hover,
                                              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);
   SetAccessibleName(bundle.GetLocalizedString(accessible_name_id));
   set_focusable(true);
   set_request_focus_on_press(false);
 }
 
 TrayPopupHeaderButton::~TrayPopupHeaderButton() {}
 
@@ skipping 226 matching lines @@
     tray_view->set_border(views::Border::CreateEmptyBorder(
         kTrayLabelItemVerticalPaddingVeriticalAlignment,
         horizontal_padding,
         kTrayLabelItemVerticalPaddingVeriticalAlignment,
         horizontal_padding));
   }
 }
 
 }  // namespace internal
 }  // namespace ash