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

chrome/browser/views/frame/browser_view.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/views/frame/browser_view.h"
 
 #if defined(OS_LINUX)
 #include <gtk/gtk.h>
 #endif
 
@@ skipping 1033 matching lines @@
 bool BrowserView::GetAcceleratorForCommandId(int command_id,
                                              views::Accelerator* accelerator) {
   // Let's let the ToolbarView own the canonical implementation of this method.
   return toolbar_->GetAcceleratorForCommandId(command_id, accelerator);
 }
 
 bool BrowserView::IsLabelForCommandIdDynamic(int command_id) const {
   return command_id == IDC_RESTORE_TAB;
 }
 
-std::wstring BrowserView::GetLabelForCommandId(int command_id) const {
+string16 BrowserView::GetLabelForCommandId(int command_id) const {
   DCHECK(command_id == IDC_RESTORE_TAB);
 
   int string_id = IDS_RESTORE_TAB;
   if (IsCommandIdEnabled(command_id)) {
     TabRestoreService* trs = browser_->profile()->GetTabRestoreService();
     if (trs && trs->entries().front()->type == TabRestoreService::WINDOW)
       string_id = IDS_RESTORE_WINDOW;
   }
-  return l10n_util::GetString(string_id);
+  return l10n_util::GetStringUTF16(string_id);
 }
 
 void BrowserView::ExecuteCommand(int command_id) {
   browser_->ExecuteCommand(command_id);
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 // BrowserView, views::WindowDelegate implementation:
 
 bool BrowserView::CanResize() const {
@@ skipping 738 matching lines @@
 
 // static
 FindBar* BrowserWindow::CreateFindBar(Browser* browser) {
   return browser::CreateFindBar(static_cast<BrowserView*>(browser->window()));
 }
 
 // static
 void BrowserList::AllBrowsersClosed() {
   views::Window::CloseAllSecondaryWindows();
 }