[reland] views: Move MenuButton from TextButton to LabelButton.

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 "base/memory/scoped_ptr.h"
 #include "ui/events/event_constants.h"
 #include "ui/gfx/animation/animation_delegate.h"
 #include "ui/views/controls/button/button.h"
 
 namespace gfx {
 class ThrobAnimation;
 }
 
 namespace views {
 
 class CustomButtonStateChangedDelegate;
 
-// A button with custom rendering. The common base class of ImageButton and
-// TextButton.
+// A button with custom rendering. The common base class of ImageButton,
+// LabelButton and TextButton.
 // Note that this type of button is not focusable by default and will not be
 // part of the focus chain.  Call SetFocusable(true) to make it part of the
 // focus chain.
 class VIEWS_EXPORT CustomButton : public Button,
                                   public gfx::AnimationDelegate {
  public:
   // The menu button's class name.
   static const char kViewClassName[];
 
   static const CustomButton* AsCustomButton(const views::View* view);
@@ skipping 119 matching lines @@
 protected:
   CustomButtonStateChangedDelegate() {}
 
 private:
   DISALLOW_COPY_AND_ASSIGN(CustomButtonStateChangedDelegate);
 };
 
 }  // namespace views
 
 #endif  // UI_VIEWS_CONTROLS_BUTTON_CUSTOM_BUTTON_H_