Move views::Label DisabledColor logic into views::LabelButtonLabel

ui/views/controls/button/label_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_LABEL_BUTTON_H_
 #define UI_VIEWS_CONTROLS_BUTTON_LABEL_BUTTON_H_
 
 #include <array>
 #include <memory>
 
 #include "base/compiler_specific.h"
 #include "base/gtest_prod_util.h"
 #include "base/macros.h"
 #include "third_party/skia/include/core/SkColor.h"
 #include "ui/gfx/image/image_skia.h"
 #include "ui/views/controls/button/custom_button.h"
 #include "ui/views/controls/image_view.h"
 #include "ui/views/controls/label.h"
 #include "ui/views/native_theme_delegate.h"
 #include "ui/views/style/typography.h"
 
 namespace views {
 
 class InkDropContainerView;
 class LabelButtonBorder;
+class LabelButtonLabel;
 
 // LabelButton is a button with text and an icon, it's not focusable by default.
 class VIEWS_EXPORT LabelButton : public CustomButton,
                                  public NativeThemeDelegate {
  public:
   // The length of the hover fade animation.
   static const int kHoverAnimationDurationMs;
 
   static const char kViewClassName[];
 
@@ skipping 64 matching lines @@
   const char* GetClassName() const override;
   void EnableCanvasFlippingForRTLUI(bool flip) override;
   void AddInkDropLayer(ui::Layer* ink_drop_layer) override;
   void RemoveInkDropLayer(ui::Layer* ink_drop_layer) override;
   std::unique_ptr<InkDrop> CreateInkDrop() override;
   std::unique_ptr<InkDropRipple> CreateInkDropRipple() const override;
   std::unique_ptr<InkDropHighlight> CreateInkDropHighlight() const override;
 
  protected:
   ImageView* image() const { return image_; }
-  Label* label() const { return label_; }
+  Label* label() const;
   InkDropContainerView* ink_drop_container() const {
     return ink_drop_container_;
   }
 
   bool explicitly_set_normal_color() const {
     return explicitly_set_colors_[STATE_NORMAL];
   }
 
   // Returns the available area for the label and image. Subclasses can change
   // these bounds if they need room to do manual painting.
@@ skipping 58 matching lines @@
   // as false.
   void ResetCachedPreferredSize();
 
   // Updates additional state related to focus or default status, rather than
   // merely the CustomButton::state(). E.g. ensures the label text color is
   // correct for the current background.
   void ResetLabelEnabledColor();
 
   // The image and label shown in the button.
   ImageView* image_;
-  Label* label_;
+  LabelButtonLabel* label_;
 
   // A separate view is necessary to hold the ink drop layer so that it can
   // be stacked below |image_| and on top of |label_|, without resorting to
   // drawing |label_| on a layer (which can mess with subpixel anti-aliasing).
   InkDropContainerView* ink_drop_container_;
 
   // The cached font lists in the normal and default button style. The latter
   // may be bold.
   gfx::FontList cached_normal_font_list_;
   gfx::FontList cached_default_button_font_list_;
@@ skipping 33 matching lines @@
   // text direction) while |this| is laid out as ALIGN_LEFT (alignment matches
   // UI direction).
   gfx::HorizontalAlignment horizontal_alignment_;
 
   DISALLOW_COPY_AND_ASSIGN(LabelButton);
 };
 
 }  // namespace views
 
 #endif  // UI_VIEWS_CONTROLS_BUTTON_LABEL_BUTTON_H_