Introduce highlight-path generators to ash/

Replaces trivial cases of kHighlightPathKey with installing generators.
Follow-up CLs will deal with creating new generators for more-complex
cases.

Bug: chromium:1007546
Change-Id: Id5911c450a3a8da43eb3cce4051265da6a995f7a
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1841660
Auto-Submit: Peter Boström <pbos@chromium.org>
Reviewed-by: Ahmed Fakhry <afakhry@chromium.org>
Reviewed-by: Tao Wu <wutao@chromium.org>
Reviewed-by: Tetsui Ohkubo <tetsui@chromium.org>
Commit-Queue: Peter Boström <pbos@chromium.org>
Cr-Commit-Position: refs/heads/master@{#703609}

ash/app_list/views/assistant/privacy_info_view.cc

@@ -14,6 +14,7 @@
 #include "ui/views/animation/ink_drop_impl.h"
 #include "ui/views/border.h"
 #include "ui/views/controls/button/image_button.h"
+#include "ui/views/controls/highlight_path_generator.h"
 #include "ui/views/controls/image_view.h"
 #include "ui/views/controls/styled_label.h"
 #include "ui/views/layout/box_layout.h"
@@ -199,10 +200,7 @@ void PrivacyInfoView::InitCloseButton() {
   close_button_->set_ink_drop_highlight_opacity(kInkDropHighlightOpacity);
   close_button_->set_ink_drop_base_color(kInkDropBaseColor);
   close_button_->set_has_ink_drop_action_on_click(true);
-  auto highlight_path = std::make_unique<SkPath>();
-  highlight_path->addOval(gfx::RectToSkRect(gfx::Rect(close_button_->size())));
-  close_button_->SetProperty(views::kHighlightPathKey,
-                             highlight_path.release());
+  views::InstallCircleHighlightPathGenerator(close_button_);
   row_container_->AddChildView(close_button_);
 }
 

ash/system/unified/feature_pod_button.cc

@@ -21,6 +21,7 @@
 #include "ui/views/animation/ink_drop_impl.h"
 #include "ui/views/animation/ink_drop_mask.h"
 #include "ui/views/border.h"
+#include "ui/views/controls/highlight_path_generator.h"
 #include "ui/views/controls/image_view.h"
 #include "ui/views/controls/label.h"
 #include "ui/views/layout/box_layout.h"
@@ -48,10 +49,7 @@ FeaturePodIconButton::FeaturePodIconButton(views::ButtonListener* listener)
   SetImageHorizontalAlignment(ALIGN_CENTER);
   SetImageVerticalAlignment(ALIGN_MIDDLE);
   TrayPopupUtils::ConfigureTrayPopupButton(this);
-
-  auto path = std::make_unique<SkPath>();
-  path->addOval(gfx::RectToSkRect(gfx::Rect(kUnifiedFeaturePodIconSize)));
-  SetProperty(views::kHighlightPathKey, path.release());
+  views::InstallCircleHighlightPathGenerator(this);
 }
 
 FeaturePodIconButton::~FeaturePodIconButton() = default;

ash/system/unified/top_shortcut_button.cc

@@ -15,6 +15,7 @@
 #include "ui/views/animation/ink_drop_highlight.h"
 #include "ui/views/animation/ink_drop_impl.h"
 #include "ui/views/animation/ink_drop_mask.h"
+#include "ui/views/controls/highlight_path_generator.h"
 #include "ui/views/view_class_properties.h"
 
 namespace ash {
@@ -57,9 +58,7 @@ TopShortcutButton::TopShortcutButton(views::ButtonListener* listener,
 
   TrayPopupUtils::ConfigureTrayPopupButton(this);
 
-  auto path = std::make_unique<SkPath>();
-  path->addOval(gfx::RectToSkRect(gfx::Rect(CalculatePreferredSize())));
-  SetProperty(views::kHighlightPathKey, path.release());
+  views::InstallCircleHighlightPathGenerator(this);
 }
 
 TopShortcutButton::~TopShortcutButton() = default;
@@ -75,7 +74,7 @@ void TopShortcutButton::PaintButtonContents(gfx::Canvas* canvas) {
       AshColorProvider::ControlsLayerType::kInactiveControlBackground,
       kUnifiedMenuButtonColor));
   flags.setStyle(cc::PaintFlags::kFill_Style);
-  canvas->DrawPath(*GetProperty(views::kHighlightPathKey), flags);
+  canvas->DrawPath(views::GetHighlightPath(this), flags);
 
   views::ImageButton::PaintButtonContents(canvas);
 }

ash/system/unified/unified_slider_view.cc

@@ -14,6 +14,7 @@
 #include "ui/views/accessibility/view_accessibility.h"
 #include "ui/views/animation/ink_drop_mask.h"
 #include "ui/views/border.h"
+#include "ui/views/controls/highlight_path_generator.h"
 #include "ui/views/layout/box_layout.h"
 #include "ui/views/view_class_properties.h"
 #include "ui/views/widget/widget.h"
@@ -59,9 +60,7 @@ UnifiedSliderButton::UnifiedSliderButton(views::ButtonListener* listener,
     : TopShortcutButton(listener, accessible_name_id) {
   SetVectorIcon(icon);
   SetBorder(views::CreateEmptyBorder(kUnifiedCircularButtonFocusPadding));
-  auto path = std::make_unique<SkPath>();
-  path->addOval(gfx::RectToSkRect(gfx::Rect(CalculatePreferredSize())));
-  SetProperty(views::kHighlightPathKey, path.release());
+  views::InstallCircleHighlightPathGenerator(this);
 }
 
 UnifiedSliderButton::~UnifiedSliderButton() = default;