Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1434)

Unified Diff: views/controls/combobox/combobox.cc

Issue 3159031: Remove wstrings from bookmarks, part 12. (Closed)
Patch Set: rebased ToT Created 10 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/views/uninstall_view.cc ('k') | views/controls/combobox/native_combobox_gtk.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: views/controls/combobox/combobox.cc
diff --git a/views/controls/combobox/combobox.cc b/views/controls/combobox/combobox.cc
index e213bdc148828219081f22e98142796e659505b1..0c24a0de47b543484f7de767fb0c7d9bffa32807 100644
--- a/views/controls/combobox/combobox.cc
+++ b/views/controls/combobox/combobox.cc
@@ -7,6 +7,7 @@
#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"
@@ -96,7 +97,7 @@ bool Combobox::GetAccessibleRole(AccessibilityTypes::Role* role) {
bool Combobox::GetAccessibleValue(std::wstring* value) {
DCHECK(value);
- *value = model_->GetItemAt(selected_item_);
+ *value = UTF16ToWideHack(model_->GetItemAt(selected_item_));
return true;
}
« no previous file with comments | « chrome/browser/views/uninstall_view.cc ('k') | views/controls/combobox/native_combobox_gtk.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698