diff options
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}; |