Avoid LabelButtonBorder static casting.

Static casting View::border() to LabelButtonBorder is bad.
Create replacement LabelButtonBorders instances as needed.

Remove redundant border setting in ToolbarButton.
Refactor some BlueButton border setting code.

BUG=155363
TEST=No button behavior/appearance changes.
R=sky@chromium.org,erg@chromium.org

Review URL: https://codereview.chromium.org/133683009

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

1 files changed, 2 insertions, 2 deletions

diff --git a/ash/system/user/tray_user.cc b/ash/system/user/tray_user.cc
index 9cc0c98..5a07ea6 100644
--- a/ash/system/user/tray_user.cc
+++ b/ash/system/user/tray_user.cc
@@ -832,8 +832,7 @@ void UserView::AddLogoutButton(user::LoginStatus login) {
   logout_button_ = logout_button;
   // In public account mode, the logout button border has a custom color.
   if (login == user::LOGGED_IN_PUBLIC) {
-    TrayPopupLabelButtonBorder* border =
-        static_cast<TrayPopupLabelButtonBorder*>(logout_button_->border());
+    TrayPopupLabelButtonBorder* border = new TrayPopupLabelButtonBorder();
     border->SetPainter(false, views::Button::STATE_NORMAL,
                        views::Painter::CreateImageGridPainter(
                            kPublicAccountLogoutButtonBorderImagesNormal));
@@ -843,6 +842,7 @@ void UserView::AddLogoutButton(user::LoginStatus login) {
     border->SetPainter(false, views::Button::STATE_PRESSED,
                        views::Painter::CreateImageGridPainter(
                            kPublicAccountLogoutButtonBorderImagesHovered));
+    logout_button_->set_border(border);
   }
   AddChildView(logout_button_);
 }