diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-10-12 14:27:29 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-10-13 09:35:20 +0000 |
| commit | c30a6232df03e1efbd9f3b226777b07e087a1122 (patch) | |
| tree | e992f45784689f373bcc38d1b79a239ebe17ee23 /chromium/ui/views/controls/combobox/combobox.h | |
| parent | 7b5b123ac58f58ffde0f4f6e488bcd09aa4decd3 (diff) | |
| download | qtwebengine-chromium-85-based.tar.gz | |
BASELINE: Update Chromium to 85.0.4183.14085-based
Change-Id: Iaa42f4680837c57725b1344f108c0196741f6057
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'chromium/ui/views/controls/combobox/combobox.h')
| -rw-r--r-- | chromium/ui/views/controls/combobox/combobox.h | 4 |
1 files changed, 2 insertions, 2 deletions
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<FocusRing> focus_ring_; + FocusRing* focus_ring_ = nullptr; ScopedObserver<ui::ComboboxModel, ui::ComboboxModelObserver> observer_{this}; |