Remove some pre-md code from TrayPopupUtils and UserView.

ash/common/system/user/user_view.cc

 // Copyright 2014 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/common/system/user/user_view.h"
 
 #include <algorithm>
 #include <utility>
 
 #include "ash/common/material_design/material_design_controller.h"
@@ skipping 38 matching lines @@
 
 namespace ash {
 namespace tray {
 
 namespace {
 
 bool UseMd() {
   return MaterialDesignController::IsSystemTrayMenuMaterial();
 }
 
-const int kPublicAccountLogoutButtonBorderImagesNormal[] = {
-    IDR_AURA_TRAY_POPUP_PUBLIC_ACCOUNT_LOGOUT_BUTTON_BORDER,
-    IDR_AURA_TRAY_POPUP_LABEL_BUTTON_NORMAL_BACKGROUND,
-    IDR_AURA_TRAY_POPUP_LABEL_BUTTON_NORMAL_BACKGROUND,
-    IDR_AURA_TRAY_POPUP_PUBLIC_ACCOUNT_LOGOUT_BUTTON_BORDER,
-    IDR_AURA_TRAY_POPUP_LABEL_BUTTON_NORMAL_BACKGROUND,
-    IDR_AURA_TRAY_POPUP_LABEL_BUTTON_NORMAL_BACKGROUND,
-    IDR_AURA_TRAY_POPUP_PUBLIC_ACCOUNT_LOGOUT_BUTTON_BORDER,
-    IDR_AURA_TRAY_POPUP_LABEL_BUTTON_NORMAL_BACKGROUND,
-    IDR_AURA_TRAY_POPUP_LABEL_BUTTON_NORMAL_BACKGROUND,
-};
-
-const int kPublicAccountLogoutButtonBorderImagesHovered[] = {
-    IDR_AURA_TRAY_POPUP_PUBLIC_ACCOUNT_LOGOUT_BUTTON_BORDER,
-    IDR_AURA_TRAY_POPUP_PUBLIC_ACCOUNT_LOGOUT_BUTTON_BORDER,
-    IDR_AURA_TRAY_POPUP_PUBLIC_ACCOUNT_LOGOUT_BUTTON_BORDER,
-    IDR_AURA_TRAY_POPUP_PUBLIC_ACCOUNT_LOGOUT_BUTTON_BORDER,
-    IDR_AURA_TRAY_POPUP_LABEL_BUTTON_HOVER_BACKGROUND,
-    IDR_AURA_TRAY_POPUP_PUBLIC_ACCOUNT_LOGOUT_BUTTON_BORDER,
-    IDR_AURA_TRAY_POPUP_PUBLIC_ACCOUNT_LOGOUT_BUTTON_BORDER,
-    IDR_AURA_TRAY_POPUP_PUBLIC_ACCOUNT_LOGOUT_BUTTON_BORDER,
-    IDR_AURA_TRAY_POPUP_PUBLIC_ACCOUNT_LOGOUT_BUTTON_BORDER,
-};
-
 // When a hover border is used, it is starting this many pixels before the icon
 // position.
 const int kTrayUserTileHoverBorderInset = 10;
 
 // Offsetting the popup message relative to the tray menu.
 const int kPopupMessageOffset = 25;
 
 // Switch to a user with the given |user_index|.
 void SwitchUser(UserIndex user_index) {
   // Do not switch users when the log screen is presented.
@@ skipping 390 matching lines @@
 void UserView::OnWillChangeFocus(View* focused_before, View* focused_now) {
   if (focused_now)
     RemoveAddUserMenuOption();
 }
 
 void UserView::OnDidChangeFocus(View* focused_before, View* focused_now) {
   // Nothing to do here.
 }
 
 void UserView::AddLogoutButton(LoginStatus login) {
-  const base::string16 title =
-      user::GetLocalizedSignOutStringForStatus(login, true);
-  auto* logout_button =
-      TrayPopupUtils::CreateTrayPopupBorderlessButton(this, title);
-  logout_button->SetAccessibleName(title);

[bruthig, 2017/02/06 17:42:50]

Why are we dropping the accessible name, isn't it needed for ChromeVox?

[Evan Stade, 2017/02/06 18:15:50]

this is already done for us in the base class:
https://cs.chromium.org/chromium/src/ui/views/controls/button/label_button.cc...

[bruthig, 2017/02/06 18:36:40]

Gotcha, thx!

-  logout_button_ = logout_button;
-  if (UseMd()) {
-    AddChildView(TrayPopupUtils::CreateVerticalSeparator());
-  } else if (login == LoginStatus::PUBLIC) {
-    // In public account mode, the logout button border has a custom color.
-    std::unique_ptr<TrayPopupLabelButtonBorder> border(
-        new TrayPopupLabelButtonBorder());
-    border->SetPainter(false, views::Button::STATE_NORMAL,
-                       views::Painter::CreateImageGridPainter(
-                           kPublicAccountLogoutButtonBorderImagesNormal));
-    border->SetPainter(false, views::Button::STATE_HOVERED,
-                       views::Painter::CreateImageGridPainter(
-                           kPublicAccountLogoutButtonBorderImagesHovered));
-    border->SetPainter(false, views::Button::STATE_PRESSED,
-                       views::Painter::CreateImageGridPainter(
-                           kPublicAccountLogoutButtonBorderImagesHovered));
-    logout_button_->SetBorder(std::move(border));
-  }
+  AddChildView(TrayPopupUtils::CreateVerticalSeparator());
+  logout_button_ = TrayPopupUtils::CreateTrayPopupBorderlessButton(
+      this, user::GetLocalizedSignOutStringForStatus(login, true));
   AddChildView(logout_button_);
 }
 
 void UserView::AddUserCard(LoginStatus login) {
   if (UseMd())
     return AddUserCardMd(login);
 
   // Add padding around the panel.
   const int kSidePadding = kTrayPopupPaddingHorizontal;
   SetBorder(views::CreateEmptyBorder(
@@ skipping 215 matching lines @@
   focus_manager_ = nullptr;
   if (user_card_view_->GetFocusManager())
     user_card_view_->GetFocusManager()->ClearFocus();
   popup_message_.reset();
   mouse_watcher_.reset();
   add_menu_option_.reset();
 }
 
 }  // namespace tray
 }  // namespace ash