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

chrome/browser/views/tab_contents/render_view_context_menu_win.cc

 // 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.
 
 #include "chrome/browser/views/tab_contents/render_view_context_menu_win.h"
 
 #include "app/l10n_util.h"
 #include "base/compiler_specific.h"
 #include "chrome/browser/profile.h"
 #include "grit/generated_resources.h"
@@ skipping 73 matching lines @@
 void RenderViewContextMenuWin::DoInit() {
   menu_.reset(new views::Menu2(menu_contents_.get()));
 }
 
 void RenderViewContextMenuWin::AppendMenuItem(int id) {
   current_radio_group_id_ = -1;
   GetTargetModel()->AddItemWithStringId(id, id);
 }
 
 void RenderViewContextMenuWin::AppendMenuItem(int id,
-                                              const std::wstring& label) {
+                                              const string16& label) {
   current_radio_group_id_ = -1;
   GetTargetModel()->AddItem(id, label);
 }
 
 void RenderViewContextMenuWin::AppendRadioMenuItem(int id,
-                                                   const std::wstring& label) {
+                                                   const string16& label) {
   if (current_radio_group_id_ < 0)
     current_radio_group_id_ = id;
   GetTargetModel()->AddRadioItem(id, label, current_radio_group_id_);
 }
 
-void RenderViewContextMenuWin::AppendCheckboxMenuItem(
-    int id,
-    const std::wstring& label) {
+void RenderViewContextMenuWin::AppendCheckboxMenuItem(int id,
+                                                      const string16& label) {
   current_radio_group_id_ = -1;
   GetTargetModel()->AddCheckItem(id, label);
 }
 
 void RenderViewContextMenuWin::AppendSeparator() {
   current_radio_group_id_ = -1;
   GetTargetModel()->AddSeparator();
 }
 
-void RenderViewContextMenuWin::StartSubMenu(int id, const std::wstring& label) {
+void RenderViewContextMenuWin::StartSubMenu(int id, const string16& label) {
   if (sub_menu_contents_) {
     NOTREACHED() << "nested submenus not supported yet";
     return;
   }
   current_radio_group_id_ = -1;
   sub_menu_contents_ = new views::SimpleMenuModel(this);
   menu_contents_->AddSubMenu(label, sub_menu_contents_);
   submenu_models_.push_back(sub_menu_contents_);
 }
 
 void RenderViewContextMenuWin::FinishSubMenu() {
   DCHECK(sub_menu_contents_);
   current_radio_group_id_ = -1;
   sub_menu_contents_ = NULL;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // RenderViewContextMenuWin, private:
 
 views::SimpleMenuModel* RenderViewContextMenuWin::GetTargetModel() const {
   return sub_menu_contents_ ? sub_menu_contents_ : menu_contents_.get();
 }