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/combobox/combobox.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'chromium/ui/views/controls/combobox/combobox.h') diff --git a/chromium/ui/views/controls/combobox/combobox.h b/chromium/ui/views/controls/combobox/combobox.h index d6da07f7122..91ad60c9a14 100644 --- a/chromium/ui/views/controls/combobox/combobox.h +++ b/chromium/ui/views/controls/combobox/combobox.h @@ -126,7 +126,7 @@ class VIEWS_EXPORT Combobox : public View, void AdjustBoundsForRTLUI(gfx::Rect* rect) const; // Draws the selected value of the drop down list - void PaintText(gfx::Canvas* canvas); + void PaintIconAndText(gfx::Canvas* canvas); // Show the drop down list void ShowDropDownMenu(ui::MenuSourceType source_type); @@ -207,7 +207,7 @@ class VIEWS_EXPORT Combobox : public View, bool size_to_largest_label_; // The focus ring for this Combobox. - std::unique_ptr focus_ring_; + FocusRing* focus_ring_ = nullptr; ScopedObserver observer_{this}; -- cgit v1.2.1