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

ash/system/logout_button/tray_logout_button.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/logout_button/tray_logout_button.h"
 
 #include <cstddef>
 
 #include "ash/shell.h"
 #include "ash/system/tray/system_tray_delegate.h"
@@ skipping 62 matching lines @@
                                            login_status_(user::LOGGED_IN_NONE),
                                            show_logout_button_in_tray_(false) {
     views::BoxLayout* layout = new views::BoxLayout(
         views::BoxLayout::kHorizontal, 0, 0, 0);
     layout->set_spread_blank_space(true);
     SetLayoutManager(layout);
     set_border(views::Border::CreateEmptyBorder(
         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_);
     OnLoginStatusChanged(status);
   }
 
   void OnLoginStatusChanged(user::LoginStatus status) {
     login_status_ = status;
     const string16 title = GetLocalizedSignOutStringForStatus(login_status_,
                                                               false);
@@ skipping 54 matching lines @@
 void TrayLogoutButton::UpdateAfterLoginStatusChange(user::LoginStatus status) {
   logout_button_->OnLoginStatusChanged(status);
 }
 
 void TrayLogoutButton::OnShowLogoutButtonInTrayChanged(bool show) {
   logout_button_->OnShowLogoutButtonInTrayChanged(show);
 }
 
 }  // namespace internal
 }  // namespace ash