Remove some pre-md code from TrayPopupUtils and UserView.

ash/common/system/tray/tray_popup_utils.h

 // Copyright 2016 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.
 
 #ifndef ASH_COMMON_SYSTEM_TRAY_TRAY_POPUP_UTILS_H_
 #define ASH_COMMON_SYSTEM_TRAY_TRAY_POPUP_UTILS_H_
 
 #include <memory>
 
 #include "ash/common/login_status.h"
 #include "ash/common/system/tray/tray_constants.h"
 #include "ash/common/system/tray/tray_popup_ink_drop_style.h"
 #include "ash/common/system/tray/tri_view.h"
 #include "base/strings/string16.h"
 
 namespace views {
 class ButtonListener;
+class CustomButton;
 class ImageView;
 class InkDrop;
 class InkDropRipple;
 class InkDropHighlight;
 class InkDropHostView;
 class InkDropMask;
 class Label;
 class LabelButton;
 class Painter;
 class Separator;
@@ skipping 78 matching lines @@
   static views::Slider* CreateSlider(views::SliderListener* listener);
 
   // Returns a ToggleButton that has been configured for system menu layout.
   static views::ToggleButton* CreateToggleButton(
       views::ButtonListener* listener,
       int accessible_name_id);
 
   // Creates a default focus painter used for most things in tray popups.
   static std::unique_ptr<views::Painter> CreateFocusPainter();
 
+  // Common setup for various buttons in the system menu.
+  static void ConfigureTrayPopupButton(views::CustomButton* button);
+
   // Sets up |view| to be a sticky header in a tray detail scroll view.
   static void ConfigureAsStickyHeader(views::View* view);
 
   // Configures a |view| to have a visible separator below.
   static void ShowStickyHeaderSeparator(views::View* view, bool show_separator);
 
   // Configures |container_view| just like CreateDefaultRowView() would
   // configure |container| on its returned TriView. To be used when mutliple
   // targetable areas are required within a single row.
   static void ConfigureContainer(TriView::Container container,
@@ skipping 82 matching lines @@
   // |ink_drop_style|.
   static gfx::Rect GetInkDropBounds(TrayPopupInkDropStyle ink_drop_style,
                                     const views::View* host);
 
   DISALLOW_IMPLICIT_CONSTRUCTORS(TrayPopupUtils);
 };
 
 }  // namespace ash
 
 #endif  // ASH_COMMON_SYSTEM_TRAY_TRAY_POPUP_UTILS_H_