Remove kHighlightPathKey

This has now been fully replaced with HighlightPathGenerator instances.

Bug: chromium:1007546
Change-Id: Id163bd002143bc4b044dcd815abb5aa45d4e41c8
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1864381Reviewed-by: Elly Fong-Jones <ellyjones@chromium.org>
Commit-Queue: Peter Boström <pbos@chromium.org>
Cr-Commit-Position: refs/heads/master@{#706536}

ui/views/controls/focus_ring.cc

@@ -41,11 +41,6 @@ SkPath GetHighlightPathInternal(const View* view) {
       return highlight_path;
   }
 
-  // TODO(pbos): Remove kHighlightPathKey in favor of HighlightPathGenerators.
-  SkPath* highlight_path = view->GetProperty(kHighlightPathKey);
-  if (highlight_path)
-    return *highlight_path;
-
   const double corner_radius = GetCornerRadius();
   return SkPath().addRRect(SkRRect::MakeRectXY(
       RectToSkRect(view->GetLocalBounds()), corner_radius, corner_radius));

ui/views/view_class_properties.cc

@@ -22,7 +22,6 @@ DEFINE_EXPORTED_UI_CLASS_PROPERTY_TYPE(VIEWS_EXPORT, gfx::Insets*)
 DEFINE_EXPORTED_UI_CLASS_PROPERTY_TYPE(VIEWS_EXPORT,
                                        views::BubbleDialogDelegateView*)
 
-DEFINE_EXPORTED_UI_CLASS_PROPERTY_TYPE(VIEWS_EXPORT, SkPath*)
 DEFINE_EXPORTED_UI_CLASS_PROPERTY_TYPE(VIEWS_EXPORT,
                                        views::HighlightPathGenerator*)
 DEFINE_EXPORTED_UI_CLASS_PROPERTY_TYPE(VIEWS_EXPORT, views::FlexSpecification*)
@@ -35,7 +34,6 @@ DEFINE_OWNED_UI_CLASS_PROPERTY_KEY(gfx::Insets, kInternalPaddingKey, nullptr)
 DEFINE_UI_CLASS_PROPERTY_KEY(views::BubbleDialogDelegateView*,
                              kAnchoredDialogKey,
                              nullptr)
-DEFINE_OWNED_UI_CLASS_PROPERTY_KEY(SkPath, kHighlightPathKey, nullptr)
 DEFINE_OWNED_UI_CLASS_PROPERTY_KEY(views::HighlightPathGenerator,
                                    kHighlightPathGeneratorKey,
                                    nullptr)

ui/views/view_class_properties.h

@@ -8,8 +8,6 @@
 #include "ui/base/class_property.h"
 #include "ui/views/views_export.h"
 
-class SkPath;
-
 namespace gfx {
 class Insets;
 }  // namespace gfx
@@ -46,11 +44,6 @@ VIEWS_EXPORT extern const ui::ClassProperty<gfx::Insets*>* const
 VIEWS_EXPORT extern const ui::ClassProperty<BubbleDialogDelegateView*>* const
     kAnchoredDialogKey;
 
-// A property to store a highlight path related to the view. This is nominally
-// used by the default inkdrop and focus ring that are both used to highlight
-// the view in different ways.
-VIEWS_EXPORT extern const ui::ClassProperty<SkPath*>* const kHighlightPathKey;
-
 // A property to store a highlight-path generator. This generator is used to
 // generate a highlight path for focus rings or ink-drop effects.
 VIEWS_EXPORT extern const ui::ClassProperty<HighlightPathGenerator*>* const
@@ -71,7 +64,6 @@ VIEWS_EXPORT extern const ui::ClassProperty<FlexSpecification*>* const
 DECLARE_EXPORTED_UI_CLASS_PROPERTY_TYPE(VIEWS_EXPORT, gfx::Insets*)
 DECLARE_EXPORTED_UI_CLASS_PROPERTY_TYPE(VIEWS_EXPORT,
                                         views::BubbleDialogDelegateView*)
-DECLARE_EXPORTED_UI_CLASS_PROPERTY_TYPE(VIEWS_EXPORT, SkPath*)
 DECLARE_EXPORTED_UI_CLASS_PROPERTY_TYPE(VIEWS_EXPORT,
                                         views::HighlightPathGenerator*)
 DECLARE_EXPORTED_UI_CLASS_PROPERTY_TYPE(VIEWS_EXPORT, views::FlexSpecification*)