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

chrome/browser/views/toolbar_view.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 "chrome/browser/views/toolbar_view.h"
 
 #include <string>
 
 #include "app/drag_drop_types.h"
 #include "app/gfx/canvas.h"
@@ skipping 88 matching lines @@
   int group_id = 0;
   EncodingMenuController::EncodingMenuItemList::iterator it =
       encoding_menu_items.begin();
   for (; it != encoding_menu_items.end(); ++it) {
     int id = it->first;
     std::wstring& label = it->second;
     if (id == 0) {
       AddSeparator();
     } else {
       if (id == IDC_ENCODING_AUTO_DETECT) {
-        AddCheckItem(id, label);
+        AddCheckItem(id, WideToUTF16Hack(label));
       } else {
         // Use the id of the first radio command as the id of the group.
         if (group_id <= 0)
           group_id = id;
-        AddRadioItem(id, label, group_id);
+        AddRadioItem(id, WideToUTF16Hack(label), group_id);
       }
     }
   }
 }
 
 bool EncodingMenuModel::IsCommandIdChecked(int command_id) const {
   TabContents* current_tab = browser_->GetSelectedTabContents();
   EncodingMenuController controller;
   return controller.IsItemChecked(browser_->profile(),
                                   current_tab->encoding(), command_id);
@@ skipping 158 matching lines @@
     return;
 
   // Store the latest list of profiles in the browser.
   browser_->set_user_data_dir_profiles(profiles);
 
   // Add direct sub menu items for profiles.
   std::vector<std::wstring>::const_iterator iter = profiles.begin();
   for (int i = IDC_NEW_WINDOW_PROFILE_0;
        (i <= IDC_NEW_WINDOW_PROFILE_LAST) && (iter != profiles.end());
        ++i, ++iter)
-    profiles_menu_contents_->AddItem(i, *iter);
+    profiles_menu_contents_->AddItem(i, WideToUTF16Hack(*iter));
 
   // If there are more profiles then show "Other" link.
   if (iter != profiles.end()) {
     profiles_menu_contents_->AddSeparator();
     profiles_menu_contents_->AddItemWithStringId(IDC_SELECT_PROFILE,
                                                  IDS_SELECT_PROFILE);
   }
 
   // Always show a link to select a new profile.
   profiles_menu_contents_->AddSeparator();
@@ skipping 776 matching lines @@
         IDC_P13N_INFO,
         Personalization::GetMenuItemInfoText(browser()));
   }
 #endif
   app_menu_contents_->AddItemWithStringId(IDC_CLEAR_BROWSING_DATA,
                                           IDS_CLEAR_BROWSING_DATA);
   app_menu_contents_->AddItemWithStringId(IDC_IMPORT_SETTINGS,
                                           IDS_IMPORT_SETTINGS);
   app_menu_contents_->AddSeparator();
   app_menu_contents_->AddItem(IDC_OPTIONS,
-                              l10n_util::GetStringF(
+                              l10n_util::GetStringFUTF16(
                                   IDS_OPTIONS,
-                                  l10n_util::GetString(IDS_PRODUCT_NAME)));
+                                  l10n_util::GetStringUTF16(IDS_PRODUCT_NAME)));
   app_menu_contents_->AddItem(IDC_ABOUT,
-                              l10n_util::GetStringF(
+                              l10n_util::GetStringFUTF16(
                                   IDS_ABOUT,
-                                  l10n_util::GetString(IDS_PRODUCT_NAME)));
+                                  l10n_util::GetStringUTF16(IDS_PRODUCT_NAME)));
   app_menu_contents_->AddItemWithStringId(IDC_HELP_PAGE, IDS_HELP_PAGE);
   app_menu_contents_->AddSeparator();
   app_menu_contents_->AddItemWithStringId(IDC_EXIT, IDS_EXIT);
 
   app_menu_menu_.reset(new views::Menu2(app_menu_contents_.get()));
 }