Convert menu strings to UTF16, fix some views-GTK build errors.

views/controls/menu/native_menu_gtk.cc

 // Copyright (c) 2009 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/menu/native_menu_gtk.h"
 
 #include "base/string_util.h"
 #include "base/time.h"
 #include "views/accelerator.h"
 #include "views/controls/menu/menu_2.h"
@@ skipping 96 matching lines @@
 
 void NativeMenuGtk::AddSeparatorAt(int index) {
   GtkWidget* separator = gtk_separator_menu_item_new();
   gtk_widget_show(separator);
   gtk_menu_append(menu_, separator);
 }
 
 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);
   switch (type) {
     case Menu2Model::TYPE_CHECK:
       menu_item = gtk_check_menu_item_new_with_mnemonic(label.c_str());
       break;
     case Menu2Model::TYPE_RADIO:
       if (*last_radio_item) {
         menu_item = gtk_radio_menu_item_new_with_mnemonic_from_widget(
@@ skipping 96 matching lines @@
 
 ////////////////////////////////////////////////////////////////////////////////
 // MenuWrapper, public:
 
 // static
 MenuWrapper* MenuWrapper::CreateWrapper(Menu2* menu) {
   return new NativeMenuGtk(menu->model());
 }
 
 }  // namespace views