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

chrome/browser/back_forward_menu_model.cc

 // Copyright (c) 2006-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 "build/build_config.h"
 
 #include "chrome/browser/back_forward_menu_model.h"
 
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
@@ skipping 187 matching lines @@
     // Otherwise, look to see if we have reached the separator for the
     // chapter-stops. If not, this is a chapter stop.
     return (menu_id == history_items + 1 +
                        chapter_stops + 1);
   }
 
   // Look to see if we have reached the separator for the history items.
   return menu_id == history_items + 1;
 }
 
-std::wstring BackForwardMenuModel::GetItemLabel(int menu_id) const {
+string16 BackForwardMenuModel::GetItemLabel(int menu_id) const {
   // Return label "Show Full History" for the last item of the menu.
   if (menu_id == GetTotalItemCount())
-    return l10n_util::GetString(IDS_SHOWFULLHISTORY_LINK);
+    return l10n_util::GetStringUTF16(IDS_SHOWFULLHISTORY_LINK);
 
   // Return an empty string for a separator.
   if (IsSeparator(menu_id))
-    return L"";
+    return string16();
 
   NavigationEntry* entry = GetNavigationEntry(menu_id);
-  return UTF16ToWideHack(entry->GetTitleForDisplay(
-                         &GetTabContents()->controller()));
+  return entry->GetTitleForDisplay(&GetTabContents()->controller());
 }
 
 const SkBitmap& BackForwardMenuModel::GetItemIcon(int menu_id) const {
   DCHECK(ItemHasIcon(menu_id));
 
   if (menu_id == GetTotalItemCount()) {
     return *ResourceBundle::GetSharedInstance().GetBitmapNamed(
         IDR_HISTORY_FAVICON);
   }
 
@@ skipping 62 matching lines @@
   std::wstring metric_string;
   if (model_type_ == FORWARD_MENU)
     metric_string += L"ForwardMenu_";
   else
     metric_string += L"BackMenu_";
   metric_string += action;
   if (index != -1)
     metric_string += IntToWString(index);
   return metric_string;
 }