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

chrome/browser/views/frame/browser_view.h

 // 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.
 
 #ifndef CHROME_BROWSER_VIEWS_FRAME_BROWSER_VIEW_H_
 #define CHROME_BROWSER_VIEWS_FRAME_BROWSER_VIEW_H_
 
 #include <set>
 
 #include "base/gfx/native_widget_types.h"
@@ skipping 245 matching lines @@
                              int index,
                              bool user_gesture);
   virtual void TabStripEmpty();
 
   // Overridden from views::SimpleMenuModel::Delegate:
   virtual bool IsCommandIdChecked(int command_id) const;
   virtual bool IsCommandIdEnabled(int command_id) const;
   virtual bool GetAcceleratorForCommandId(int command_id,
                                           views::Accelerator* accelerator);
   virtual bool IsLabelForCommandIdDynamic(int command_id) const;
-  virtual std::wstring GetLabelForCommandId(int command_id) const;
+  virtual string16 GetLabelForCommandId(int command_id) const;
   virtual void ExecuteCommand(int command_id);
 
   // Overridden from views::WindowDelegate:
   virtual bool CanResize() const;
   virtual bool CanMaximize() const;
   virtual bool IsModal() const;
   virtual std::wstring GetWindowTitle() const;
   virtual views::View* GetInitiallyFocusedView();
   virtual bool ShouldShowWindowTitle() const;
   virtual SkBitmap GetWindowIcon();
@@ skipping 178 matching lines @@
   // A bottom bar for showing extensions.
   ExtensionShelf* extension_shelf_;
 
   typedef std::set<BrowserBubble*> BubbleSet;
   BubbleSet browser_bubbles_;
 
   DISALLOW_COPY_AND_ASSIGN(BrowserView);
 };
 
 #endif  // CHROME_BROWSER_VIEWS_FRAME_BROWSER_VIEW_H_