BASELINE: Update Chromium to 85.0.4183.14085-based

Change-Id: Iaa42f4680837c57725b1344f108c0196741f6057
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>

1 files changed, 19 insertions, 1 deletions

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