Convert some Separator fields to properties

Bug: 972256
Change-Id: Ib4aed2917ab444ca05451bf20647dab9196c1c11
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1678174Reviewed-by: Allen Bauer <kylixrd@chromium.org>
Commit-Queue: Kristyn Hamasaki <khamasaki@google.com>
Cr-Commit-Position: refs/heads/master@{#672642}

ui/views/controls/separator.cc

@@ -17,14 +17,30 @@ Separator::Separator() = default;
 
 Separator::~Separator() = default;
 
+SkColor Separator::GetColor() const {
+  if (overridden_color_ == true)
+    return overridden_color_.value();
+  return 0;
+}
+
 void Separator::SetColor(SkColor color) {
+  if (overridden_color_ == color)
+    return;
+
   overridden_color_ = color;
-  SchedulePaint();
+  OnPropertyChanged(&overridden_color_, kPropertyEffectsPaint);
+}
+
+int Separator::GetPreferredHeight() const {
+  return preferred_height_;
 }
 
 void Separator::SetPreferredHeight(int height) {
+  if (preferred_height_ == height)
+    return;
+
   preferred_height_ = height;
-  PreferredSizeChanged();
+  OnPropertyChanged(&preferred_height_, kPropertyEffectsPreferredSizeChanged);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -62,6 +78,8 @@ void Separator::OnPaint(gfx::Canvas* canvas) {
 
 BEGIN_METADATA(Separator)
 METADATA_PARENT_CLASS(View)
+ADD_PROPERTY_METADATA(Separator, SkColor, Color)
+ADD_PROPERTY_METADATA(Separator, int, PreferredHeight)
 END_METADATA()
 
 }  // namespace views

ui/views/controls/separator.h

@@ -25,8 +25,10 @@ class VIEWS_EXPORT Separator : public View {
   Separator();
   ~Separator() override;
 
+  SkColor GetColor() const;
   void SetColor(SkColor color);
 
+  int GetPreferredHeight() const;
   void SetPreferredHeight(int height);
 
   // Overridden from View: