summaryrefslogtreecommitdiffstats
path: root/views/controls/menu/native_menu_gtk.cc
diff options
context:
space:
mode:
authorbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-07-02 16:21:17 +0000
committerbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-07-02 16:21:17 +0000
commita5176dafb70d5ea7567b18917d85c4cddc937dc4 (patch)
tree45a3a875cb48ee3b54a536ba9a4a7a5902138650 /views/controls/menu/native_menu_gtk.cc
parent8e12ae06a009107635e2045db802907fd4ae2df1 (diff)
downloadchromium_src-a5176dafb70d5ea7567b18917d85c4cddc937dc4.zip
chromium_src-a5176dafb70d5ea7567b18917d85c4cddc937dc4.tar.gz
chromium_src-a5176dafb70d5ea7567b18917d85c4cddc937dc4.tar.bz2
Convert menu strings to UTF16, fix some views-GTK build errors.
Review URL: http://codereview.chromium.org/150171 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@19820 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views/controls/menu/native_menu_gtk.cc')
-rw-r--r--views/controls/menu/native_menu_gtk.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/views/controls/menu/native_menu_gtk.cc b/views/controls/menu/native_menu_gtk.cc
index c81f04b..b0d8065 100644
--- a/views/controls/menu/native_menu_gtk.cc
+++ b/views/controls/menu/native_menu_gtk.cc
@@ -114,7 +114,7 @@ void NativeMenuGtk::AddSeparatorAt(int index) {
void NativeMenuGtk::AddMenuItemAt(int index,
GtkRadioMenuItem** last_radio_item) {
GtkWidget* menu_item = NULL;
- std::string label = ConvertAcceleratorsFromWindowsStyle(WideToUTF8(
+ std::string label = ConvertAcceleratorsFromWindowsStyle(UTF16ToUTF8(
model_->GetLabelAt(index)));
Menu2Model::ItemType type = model_->GetTypeAt(index);