From c30a6232df03e1efbd9f3b226777b07e087a1122 Mon Sep 17 00:00:00 2001 From: Allan Sandfeld Jensen Date: Mon, 12 Oct 2020 14:27:29 +0200 Subject: BASELINE: Update Chromium to 85.0.4183.140 Change-Id: Iaa42f4680837c57725b1344f108c0196741f6057 Reviewed-by: Allan Sandfeld Jensen --- chromium/ui/views/controls/button/button.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'chromium/ui/views/controls/button/button.h') diff --git a/chromium/ui/views/controls/button/button.h b/chromium/ui/views/controls/button/button.h index 79bab1f6034..6411eb3514b 100644 --- a/chromium/ui/views/controls/button/button.h +++ b/chromium/ui/views/controls/button/button.h @@ -292,7 +292,7 @@ class VIEWS_EXPORT Button : public InkDropHostView, return hover_animation_; } - FocusRing* focus_ring() { return focus_ring_.get(); } + FocusRing* focus_ring() { return focus_ring_; } // The button's listener. Notified when clicked. ButtonListener* listener_; @@ -368,7 +368,7 @@ class VIEWS_EXPORT Button : public InkDropHostView, SkColor ink_drop_base_color_; // The focus ring for this Button. - std::unique_ptr focus_ring_; + FocusRing* focus_ring_ = nullptr; std::unique_ptr focus_painter_; -- cgit v1.2.1