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

views/controls/menu/menu_2.h

 // 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.
 
 #ifndef CONTROLS_MENU_VIEWS_MENU_2_H_
 #define CONTROLS_MENU_VIEWS_MENU_2_H_
 
-#include <string>
-
 #include "base/gfx/native_widget_types.h"
+#include "base/string16.h"
 
 namespace gfx {
 class Point;
 }
 class SkBitmap;
 
 namespace views {
 
 class Accelerator;
 class Menu2;
@@ skipping 30 matching lines @@
   // Returns the number of items in the menu.
   virtual int GetItemCount() const = 0;
 
   // Returns the type of item at the specified index.
   virtual ItemType GetTypeAt(int index) const = 0;
 
   // Returns the command id of the item at the specified index.
   virtual int GetCommandIdAt(int index) const = 0;
 
   // Returns the label of the item at the specified index.
-  virtual std::wstring GetLabelAt(int index) const = 0;
+  virtual string16 GetLabelAt(int index) const = 0;
 
   // Returns true if the label at the specified index can change over the course
   // of the menu's lifetime. If this function returns true, the label of the
   // menu item will be updated each time the menu is shown.
   virtual bool IsLabelDynamicAt(int index) const = 0;
 
   // Gets the acclerator information for the specified index, returning true if
   // there is a shortcut accelerator for the item, false otherwise.
   virtual bool GetAcceleratorAt(int index,
                                 views::Accelerator* accelerator) const = 0;
@@ skipping 72 matching lines @@
 
   // The object that actually implements the menu.
   MenuWrapper* wrapper_;
 
   DISALLOW_COPY_AND_ASSIGN(Menu2);
 };
 
 }  // namespace views
 
 #endif  // CONTROLS_MENU_VIEWS_MENU_2_H_