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

ui/views/controls/label.cc

 // 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.
 
 #include "ui/views/controls/label.h"
 
 #include <stddef.h>
 
 #include <algorithm>
 #include <cmath>
@@ skipping 91 matching lines @@
 
 void Label::SetEnabledColor(SkColor color) {
   if (enabled_color_set_ && requested_enabled_color_ == color)
     return;
   is_first_paint_text_ = true;
   requested_enabled_color_ = color;
   enabled_color_set_ = true;
   RecalculateColors();
 }
 
-// TODO(tapted): Move this into a subclass used only by LabelButton.
-void Label::SetDisabledColorForLabelButton(SkColor color) {
-  if (disabled_color_set_ && requested_disabled_color_ == color)
-    return;
-  is_first_paint_text_ = true;
-  requested_disabled_color_ = color;
-  disabled_color_set_ = true;
-  RecalculateColors();
-}
-
 void Label::SetBackgroundColor(SkColor color) {
   if (background_color_set_ && background_color_ == color)
     return;
   is_first_paint_text_ = true;
   background_color_ = color;
   background_color_set_ = true;
+  OnBackgroundColorChanged();
   RecalculateColors();
 }
 
 void Label::SetSelectionTextColor(SkColor color) {
   if (selection_text_color_set_ && requested_selection_text_color_ == color)
     return;
   is_first_paint_text_ = true;
   requested_selection_text_color_ = color;
   selection_text_color_set_ = true;
   RecalculateColors();
@@ skipping 288 matching lines @@
 
   if (ShouldShowDefaultTooltip()) {
     // Note that |render_text_| is never elided (see the comment in Init() too).
     tooltip->assign(render_text_->GetDisplayText());
     return true;
   }
 
   return false;
 }
 
-void Label::OnEnabledChanged() {
-  ApplyTextColors();

[tapted, 2017/06/06 12:30:24]

I tested and ran jobs in earlier patchsets with this just NOTREACHED(). (and
with LabelButtonLabel jumping over it). There's just
LabelTest.NoSchedulePaintInOnPaint that calls SetEnabled(false) on a
non-LabelButton Label as far as I can tell - nothing interesting.

-  View::OnEnabledChanged();
-}
-
 std::unique_ptr<gfx::RenderText> Label::CreateRenderText(
     const base::string16& text,
     gfx::HorizontalAlignment alignment,
     gfx::DirectionalityMode directionality,
     gfx::ElideBehavior elide_behavior) const {
   std::unique_ptr<gfx::RenderText> render_text(
       render_text_->CreateInstanceOfSameType());
   render_text->SetHorizontalAlignment(alignment);
   render_text->SetDirectionalityMode(directionality);
   render_text->SetElideBehavior(elide_behavior);
@@ skipping 49 matching lines @@
 
     if (view->layer() && view->layer()->fills_bounds_opaquely()) {
       DLOG(WARNING) << "Ancestor view has a non-opaque layer: "
                     << view->GetClassName() << " with ID " << view->id();
       break;
     }
   }
 #endif
 }
 
+SkColor Label::EnsureTextColorReadable(SkColor requested) const {
+  return auto_color_readability_
+             ? color_utils::GetReadableColor(requested, background_color_)
+             : requested;
+}
+
+SkColor Label::GetForegroundColor() const {
+  return enabled_color();
+}
+
+void Label::OnBackgroundColorChanged() {}
+
+void Label::ApplyTextColors() const {
+  bool subpixel_rendering_suppressed =
+      SkColorGetA(background_color_) != SK_AlphaOPAQUE ||
+      !subpixel_rendering_enabled_;
+  for (size_t i = 0; i < lines_.size(); ++i) {
+    lines_[i]->SetColor(GetForegroundColor());
+    lines_[i]->set_selection_color(actual_selection_text_color_);
+    lines_[i]->set_selection_background_focused_color(
+        selection_background_color_);
+    lines_[i]->set_subpixel_rendering_suppressed(subpixel_rendering_suppressed);
+  }
+}
+
 void Label::OnBoundsChanged(const gfx::Rect& previous_bounds) {
   if (previous_bounds.size() != size())
     InvalidateLayout();
 }
 
 void Label::OnPaint(gfx::Canvas* canvas) {
   View::OnPaint(canvas);
   if (is_first_paint_text_) {
     // TODO(ckocagil): Remove ScopedTracker below once crbug.com/441028 is
     // fixed.
@@ skipping 302 matching lines @@
   render_text_->SetDirectionalityMode(gfx::DIRECTIONALITY_FROM_TEXT);
   // NOTE: |render_text_| should not be elided at all. This is used to keep some
   // properties and to compute the size of the string.
   render_text_->SetElideBehavior(gfx::NO_ELIDE);
   render_text_->SetFontList(font_list);
   render_text_->SetCursorEnabled(false);
   render_text_->SetWordWrapBehavior(gfx::TRUNCATE_LONG_WORDS);
 
   elide_behavior_ = gfx::ELIDE_TAIL;
   stored_selection_range_ = gfx::Range::InvalidRange();
-  enabled_color_set_ = disabled_color_set_ = background_color_set_ = false;
+  enabled_color_set_ = background_color_set_ = false;
   selection_text_color_set_ = selection_background_color_set_ = false;
   subpixel_rendering_enabled_ = true;
   auto_color_readability_ = true;
   multi_line_ = false;
   UpdateColorsFromTheme(GetNativeTheme());
   handles_tooltips_ = true;
   collapse_when_hidden_ = false;
   fixed_width_ = 0;
   max_width_ = 0;
   is_first_paint_text_ = true;
@@ skipping 121 matching lines @@
       size.set_width(std::max(size.width(), line.width()));
       size.set_height(std::max(line_height(), size.height() + line.height()));
     }
   }
   const gfx::Insets shadow_margin = -gfx::ShadowValue::GetMargin(shadows());
   size.Enlarge(shadow_margin.width(), shadow_margin.height());
   return size;
 }
 
 void Label::RecalculateColors() {
-  actual_enabled_color_ = auto_color_readability_ ?
-      color_utils::GetReadableColor(requested_enabled_color_,
-                                    background_color_) :
-      requested_enabled_color_;
-  actual_disabled_color_ = auto_color_readability_ ?
-      color_utils::GetReadableColor(requested_disabled_color_,
-                                    background_color_) :
-      requested_disabled_color_;
+  actual_enabled_color_ = EnsureTextColorReadable(requested_enabled_color_);
   actual_selection_text_color_ =
       auto_color_readability_
           ? color_utils::GetReadableColor(requested_selection_text_color_,
                                           selection_background_color_)
           : requested_selection_text_color_;
 
   ApplyTextColors();
   SchedulePaint();
 }
 
-void Label::ApplyTextColors() const {
-  SkColor color = enabled() ? actual_enabled_color_ : actual_disabled_color_;
-  bool subpixel_rendering_suppressed =
-      SkColorGetA(background_color_) != SK_AlphaOPAQUE ||
-      !subpixel_rendering_enabled_;
-  for (size_t i = 0; i < lines_.size(); ++i) {
-    lines_[i]->SetColor(color);
-    lines_[i]->set_selection_color(actual_selection_text_color_);
-    lines_[i]->set_selection_background_focused_color(
-        selection_background_color_);
-    lines_[i]->set_subpixel_rendering_suppressed(subpixel_rendering_suppressed);
-  }
-}
-
 void Label::UpdateColorsFromTheme(const ui::NativeTheme* theme) {
   if (!enabled_color_set_) {
     requested_enabled_color_ =
         style::GetColor(text_context_, style::STYLE_PRIMARY, theme);
   }
-  if (!disabled_color_set_) {
-    requested_disabled_color_ =
-        style::GetColor(text_context_, style::STYLE_DISABLED, theme);
-  }
   if (!background_color_set_) {
     background_color_ =
         theme->GetSystemColor(ui::NativeTheme::kColorId_DialogBackground);
   }
   if (!selection_text_color_set_) {
     requested_selection_text_color_ = theme->GetSystemColor(
         ui::NativeTheme::kColorId_LabelTextSelectionColor);
   }
   if (!selection_background_color_set_) {
     selection_background_color_ = theme->GetSystemColor(
@@ skipping 36 matching lines @@
       .WriteText(GetSelectedText());
 }
 
 void Label::BuildContextMenuContents() {
   context_menu_contents_.AddItemWithStringId(IDS_APP_COPY, IDS_APP_COPY);
   context_menu_contents_.AddItemWithStringId(IDS_APP_SELECT_ALL,
                                              IDS_APP_SELECT_ALL);
 }
 
 }  // namespace views