Index: ui/views/controls/combobox/combobox.cc |
diff --git a/ui/views/controls/combobox/combobox.cc b/ui/views/controls/combobox/combobox.cc |
index 8ef7b365e75a6d932447754a7c08f184a3f18e29..e53880b983b4544af80cfb0ef1bcb3e52f0749a9 100644 |
--- a/ui/views/controls/combobox/combobox.cc |
+++ b/ui/views/controls/combobox/combobox.cc |
@@ -349,7 +349,7 @@ void Combobox::UpdateFromModel() { |
base::i18n::AdjustStringForLocaleDirection(&text); |
menu->AppendMenuItem(i + kFirstMenuItemId, text, MenuItemView::NORMAL); |
- max_width = std::max(max_width, font.GetStringWidth(text)); |
+ max_width = std::max<int>(max_width, font.GetStringWidth(text)); |
} |
content_size_.SetSize(max_width, font.GetHeight()); |