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/base/models/combobox_model.cc | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) (limited to 'chromium/ui/base/models/combobox_model.cc') diff --git a/chromium/ui/base/models/combobox_model.cc b/chromium/ui/base/models/combobox_model.cc index c6913da55e5..a6a311fc465 100644 --- a/chromium/ui/base/models/combobox_model.cc +++ b/chromium/ui/base/models/combobox_model.cc @@ -4,9 +4,27 @@ #include "ui/base/models/combobox_model.h" +#include "ui/base/models/image_model.h" + namespace ui { -bool ComboboxModel::IsItemSeparatorAt(int index) { +base::string16 ComboboxModel::GetDropDownTextAt(int index) const { + return GetItemAt(index); +} + +base::string16 ComboboxModel::GetDropDownSecondaryTextAt(int index) const { + return base::string16(); +} + +ImageModel ComboboxModel::GetIconAt(int index) const { + return ui::ImageModel(); +} + +ImageModel ComboboxModel::GetDropDownIconAt(int index) const { + return GetIconAt(index); +} + +bool ComboboxModel::IsItemSeparatorAt(int index) const { return false; } -- cgit v1.2.1