Index: views/controls/combobox/native_combobox_win.cc |
diff --git a/views/controls/combobox/native_combobox_win.cc b/views/controls/combobox/native_combobox_win.cc |
index b1bc88f77669199fc0402486a03a9c8fbf829e47..720e51fff0931dce5a4bae291e020475cc26c3da 100644 |
--- a/views/controls/combobox/native_combobox_win.cc |
+++ b/views/controls/combobox/native_combobox_win.cc |
@@ -7,6 +7,7 @@ |
#include "app/combobox_model.h" |
#include "app/resource_bundle.h" |
#include "base/i18n/rtl.h" |
+#include "base/utf_string_conversions.h" |
#include "gfx/font.h" |
#include "gfx/native_theme_win.h" |
#include "views/controls/combobox/combobox.h" |
@@ -46,7 +47,7 @@ void NativeComboboxWin::UpdateFromModel() { |
int max_width = 0; |
int num_items = combobox_->model()->GetItemCount(); |
for (int i = 0; i < num_items; ++i) { |
- const std::wstring& text = combobox_->model()->GetItemAt(i); |
+ const std::wstring& text = UTF16ToWide(combobox_->model()->GetItemAt(i)); |
// Inserting the Unicode formatting characters if necessary so that the |
// text is displayed correctly in right-to-left UIs. |