Remove some pre-md code from TrayPopupUtils and UserView.

ui/views/controls/button/custom_button.h

 // 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.
 
 #ifndef UI_VIEWS_CONTROLS_BUTTON_CUSTOM_BUTTON_H_
 #define UI_VIEWS_CONTROLS_BUTTON_CUSTOM_BUTTON_H_
 
 #include <memory>
 
 #include "base/macros.h"
@@ skipping 79 matching lines @@
     notify_action_ = notify_action;
   }
 
   void set_hide_ink_drop_when_showing_context_menu(
       bool hide_ink_drop_when_showing_context_menu) {
     hide_ink_drop_when_showing_context_menu_ =
         hide_ink_drop_when_showing_context_menu;
   }
 
   void set_ink_drop_base_color(SkColor color) { ink_drop_base_color_ = color; }
+  void set_has_ink_drop_action_on_click(bool has_ink_drop_action_on_click) {
+    has_ink_drop_action_on_click_ = has_ink_drop_action_on_click;
+  }
 
   void SetHotTracked(bool is_hot_tracked);
   bool IsHotTracked() const;
 
   // Overridden from View:
   void OnEnabledChanged() override;
   const char* GetClassName() const override;
   bool OnMousePressed(const ui::MouseEvent& event) override;
   bool OnMouseDragged(const ui::MouseEvent& event) override;
   void OnMouseReleased(const ui::MouseEvent& event) override;
@@ skipping 36 matching lines @@
 
   // Returns true if the event is one that can trigger notifying the listener.
   // This implementation returns true if the left mouse button is down.
   virtual bool IsTriggerableEvent(const ui::Event& event);
 
   // Returns true if the button should become pressed when the user
   // holds the mouse down over the button. For this implementation,
   // we simply return IsTriggerableEvent(event).
   virtual bool ShouldEnterPushedState(const ui::Event& event);
 
-  void set_has_ink_drop_action_on_click(bool has_ink_drop_action_on_click) {
-    has_ink_drop_action_on_click_ = has_ink_drop_action_on_click;
-  }
-
   // Returns true if the button should enter hovered state; that is, if the
   // mouse is over the button, and no other window has capture (which would
   // prevent the button from receiving MouseExited events and updating its
   // node_data). This does not take into account enabled node_data.
   bool ShouldEnterHoveredState();
 
   // Overridden from Button:
   void NotifyClick(const ui::Event& event) override;
   void OnClickCanceled(const ui::Event& event) override;
 
@@ skipping 31 matching lines @@
 
   // The color of the ripple and hover.
   SkColor ink_drop_base_color_;
 
   DISALLOW_COPY_AND_ASSIGN(CustomButton);
 };
 
 }  // namespace views
 
 #endif  // UI_VIEWS_CONTROLS_BUTTON_CUSTOM_BUTTON_H_