Remove wstrings from bookmarks, part 12.

views/controls/combobox/combobox.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/combobox.h"
 
 #include "app/combobox_model.h"
 #include "base/keyboard_codes.h"
 #include "base/logging.h"
+#include "base/utf_string_conversions.h"
 #include "views/controls/combobox/native_combobox_wrapper.h"
 #include "views/controls/native/native_view_host.h"
 
 namespace views {
 
 // static
 const char Combobox::kViewClassName[] = "views/Combobox";
 
 ////////////////////////////////////////////////////////////////////////////////
 // Combobox, public:
@@ skipping 69 matching lines @@
 bool Combobox::GetAccessibleRole(AccessibilityTypes::Role* role) {
   DCHECK(role);
 
   *role = AccessibilityTypes::ROLE_COMBOBOX;
   return true;
 }
 
 bool Combobox::GetAccessibleValue(std::wstring* value) {
   DCHECK(value);
 
-  *value = model_->GetItemAt(selected_item_);
+  *value = UTF16ToWideHack(model_->GetItemAt(selected_item_));
   return true;
 }
 
 void Combobox::Focus() {
   // Forward the focus to the wrapper.
   if (native_wrapper_)
     native_wrapper_->SetFocus();
   else
     View::Focus();  // Will focus the RootView window (so we still get
                     // keyboard messages).
 }
 
 void Combobox::ViewHierarchyChanged(bool is_add, View* parent,
                                     View* child) {
   if (is_add && !native_wrapper_ && GetWidget()) {
     native_wrapper_ = NativeComboboxWrapper::CreateWrapper(this);
     AddChildView(native_wrapper_->GetView());
   }
 }
 
 std::string Combobox::GetClassName() const {
   return kViewClassName;
 }
 
 }  // namespace views