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

chrome/browser/back_forward_menu_model_views.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 "chrome/browser/back_forward_menu_model_views.h"
 
 #include "chrome/app/chrome_dll_resource.h"
 #include "chrome/browser/browser.h"
 #include "chrome/browser/metrics/user_metrics.h"
 #include "third_party/skia/include/core/SkBitmap.h"
@@ skipping 25 matching lines @@
     int index) const {
   if (IsSeparator(GetCommandIdAt(index)))
     return views::Menu2Model::TYPE_SEPARATOR;
   return views::Menu2Model::TYPE_COMMAND;
 }
 
 int BackForwardMenuModelViews::GetCommandIdAt(int index) const {
   return index + 1;
 }
 
-std::wstring BackForwardMenuModelViews::GetLabelAt(int index) const {
+string16 BackForwardMenuModelViews::GetLabelAt(int index) const {
   return GetItemLabel(GetCommandIdAt(index));
 }
 
 bool BackForwardMenuModelViews::IsLabelDynamicAt(int index) const {
   return false;
 }
 
 bool BackForwardMenuModelViews::GetAcceleratorAt(
     int index,
     views::Accelerator* accelerator) const {
@@ skipping 32 matching lines @@
 }
 
 void BackForwardMenuModelViews::ActivatedAt(int index) {
   ExecuteCommandById(GetCommandIdAt(index));
 }
 
 void BackForwardMenuModelViews::MenuWillShow() {
   UserMetrics::RecordComputedAction(BuildActionName(L"Popup", -1),
                                     browser_->profile());
 }