Remove wstrings from bookmarks, part 12.

views/controls/combobox/native_combobox_win.cc

 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "views/controls/combobox/native_combobox_win.h"
 
 #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"
 #include "views/widget/widget.h"
 
 namespace views {
 
 // Limit how small a combobox can be.
 static const int kMinComboboxWidth = 148;
 
@@ skipping 19 matching lines @@
 ////////////////////////////////////////////////////////////////////////////////
 // NativeComboboxWin, NativeComboboxWrapper implementation:
 
 void NativeComboboxWin::UpdateFromModel() {
   SendMessage(native_view(), CB_RESETCONTENT, 0, 0);
   gfx::Font font = ResourceBundle::GetSharedInstance().GetFont(
       ResourceBundle::BaseFont);
   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.
     std::wstring localized_text;
     const wchar_t* text_ptr = text.c_str();
     if (base::i18n::AdjustStringForLocaleDirection(text, &localized_text))
       text_ptr = localized_text.c_str();
 
     SendMessage(native_view(), CB_ADDSTRING, 0,
                 reinterpret_cast<LPARAM>(text_ptr));
@@ skipping 129 matching lines @@
 ////////////////////////////////////////////////////////////////////////////////
 // NativeComboboxWrapper, public:
 
 // static
 NativeComboboxWrapper* NativeComboboxWrapper::CreateWrapper(
     Combobox* combobox) {
   return new NativeComboboxWin(combobox);
 }
 
 }  // namespace views