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

ui/views/controls/label.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_LABEL_H_
 #define UI_VIEWS_CONTROLS_LABEL_H_
 
 #include "base/compiler_specific.h"
 #include "base/gtest_prod_util.h"
 #include "base/macros.h"
@@ skipping 64 matching lines @@
 
   // Enables or disables auto-color-readability (enabled by default).  If this
   // is enabled, then calls to set any foreground or background color will
   // trigger an automatic mapper that uses color_utils::GetReadableColor() to
   // ensure that the foreground colors are readable over the background color.
   void SetAutoColorReadabilityEnabled(bool enabled);
 
   // Sets the color.  This will automatically force the color to be readable
   // over the current background color, if auto color readability is enabled.
   virtual void SetEnabledColor(SkColor color);
-  void SetDisabledColorForLabelButton(SkColor color);
 
   SkColor enabled_color() const { return actual_enabled_color_; }
 
   // Sets the background color. This won't be explicitly drawn, but the label
   // will force the text color to be readable over it.
   void SetBackgroundColor(SkColor color);
   SkColor background_color() const { return background_color_; }
 
   // Sets the selection text color. This will automatically force the color to
   // be readable over the selection background color, if auto color readability
@@ skipping 111 matching lines @@
   gfx::Size GetMinimumSize() const override;
   int GetHeightForWidth(int w) const override;
   void Layout() override;
   const char* GetClassName() const override;
   View* GetTooltipHandlerForPoint(const gfx::Point& point) override;
   bool CanProcessEventsWithinSubtree() const override;
   WordLookupClient* GetWordLookupClient() override;
   void GetAccessibleNodeData(ui::AXNodeData* node_data) override;
   bool GetTooltipText(const gfx::Point& p,
                       base::string16* tooltip) const override;
-  void OnEnabledChanged() override;
 
  protected:
   // Create a single RenderText instance to actually be painted.
   virtual std::unique_ptr<gfx::RenderText> CreateRenderText(
       const base::string16& text,
       gfx::HorizontalAlignment alignment,
       gfx::DirectionalityMode directionality,
       gfx::ElideBehavior elide_behavior) const;
 
   // Draw a focus ring. The default implementation does nothing.
   virtual void PaintFocusRing(gfx::Canvas* canvas) const;
   gfx::Rect GetFocusRingBounds() const;
 
   void PaintText(gfx::Canvas* canvas);
 
+  // Returns a color that is readable against the current background color;
+  SkColor EnsureTextColorReadable(SkColor color) const;
+
+  // Returns the color to use for foreground text.
+  virtual SkColor GetForegroundColor() const;

[sky, 2017/06/06 17:12:24]

I would prefer not to have this virtual. With this function virtual it's easy to
miss that you need to trigger a paint when the value changes. For this reason I
prefer an explicit setter.

[tapted, 2017/06/08 04:11:32]

Done. Also added a test (seemed almost too simple ;)... ) - which also allowed
me to ensure `views_internal` was set up in a way that doesn't prohibit testing.

+
+  // Called when the background color changes.
+  virtual void OnBackgroundColorChanged();
+
+  // Applies the foreground color to |lines_|.
+  void ApplyTextColors() const;
+
+  int text_context() const { return text_context_; }
+
   // View:
   void OnBoundsChanged(const gfx::Rect& previous_bounds) override;
   void VisibilityChanged(View* starting_from, bool is_visible) override;
   void OnPaint(gfx::Canvas* canvas) override;
   void OnDeviceScaleFactorChanged(float device_scale_factor) override;
   void OnNativeThemeChanged(const ui::NativeTheme* theme) override;
   gfx::NativeCursor GetCursor(const ui::MouseEvent& event) override;
   void OnFocus() override;
   void OnBlur() override;
   bool OnMousePressed(const ui::MouseEvent& event) override;
@@ skipping 52 matching lines @@
 
   // Set up |lines_| to actually be painted.
   void MaybeBuildRenderTextLines() const;
 
   // Get the text broken into lines as needed to fit the given |width|.
   std::vector<base::string16> GetLinesForWidth(int width) const;
 
   // Get the text size for the current layout.
   gfx::Size GetTextSize() const;
 
-  // Updates |actual_{enabled,disabled}_color_| from requested colors.
+  // Updates text and selection colors from requested colors.
   void RecalculateColors();
 
-  // Applies |actual_{enabled,disabled}_color_| to |lines_|.
-  void ApplyTextColors() const;
-
   // Updates any colors that have not been explicitly set from the theme.
   void UpdateColorsFromTheme(const ui::NativeTheme* theme);
 
   bool ShouldShowDefaultTooltip() const;
 
   // Empties |lines_| and updates |stored_selection_range_|.
   void ClearRenderTextLines() const;
 
   // Returns the currently selected text.
   base::string16 GetSelectedText() const;
@@ skipping 14 matching lines @@
   // The RenderText instances used to display elided and multi-line text.
   mutable std::vector<std::unique_ptr<gfx::RenderText>> lines_;
 
   // Persists the current selection range between the calls to
   // ClearRenderTextLines() and MaybeBuildRenderTextLines(). Holds an
   // InvalidRange when not in use.
   mutable gfx::Range stored_selection_range_;
 
   SkColor requested_enabled_color_ = SK_ColorRED;
   SkColor actual_enabled_color_ = SK_ColorRED;
-  SkColor requested_disabled_color_ = SK_ColorRED;
-  SkColor actual_disabled_color_ = SK_ColorRED;
   SkColor background_color_ = SK_ColorRED;
   SkColor requested_selection_text_color_ = SK_ColorRED;
   SkColor actual_selection_text_color_ = SK_ColorRED;
   SkColor selection_background_color_ = SK_ColorRED;
 
   // Set to true once the corresponding setter is invoked.
   bool enabled_color_set_;
-  bool disabled_color_set_;
   bool background_color_set_;
   bool selection_text_color_set_;
   bool selection_background_color_set_;
 
   gfx::ElideBehavior elide_behavior_;
 
   bool subpixel_rendering_enabled_;
   bool auto_color_readability_;
   // TODO(mukai): remove |multi_line_| when all RenderText can render multiline.
   bool multi_line_;
@@ skipping 13 matching lines @@
   // Context menu related members.
   ui::SimpleMenuModel context_menu_contents_;
   std::unique_ptr<views::MenuRunner> context_menu_runner_;
 
   DISALLOW_COPY_AND_ASSIGN(Label);
 };
 
 }  // namespace views
 
 #endif  // UI_VIEWS_CONTROLS_LABEL_H_