Remove wstring from views. Part 3: Switch accessibility strings to string16....

views/controls/menu/menu_item_view.cc

 // Copyright (c) 2010 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 "views/controls/menu/menu_item_view.h"
 
 #include "app/l10n_util.h"
 #include "app/menus/menu_model.h"
 #include "base/utf_string_conversions.h"
 #include "gfx/canvas.h"
@@ skipping 288 matching lines @@
 }
 
 SubmenuView* MenuItemView::CreateSubmenu() {
   if (!submenu_)
     submenu_ = new SubmenuView(this);
   return submenu_;
 }
 
 void MenuItemView::SetTitle(const std::wstring& title) {
   title_ = WideToUTF16Hack(title);
-  SetAccessibleName(UTF16ToWideHack(
-      GetAccessibleNameForMenuItem(title_, GetAcceleratorText())));
+  SetAccessibleName(GetAccessibleNameForMenuItem(title_, GetAcceleratorText()));
 }
 
 void MenuItemView::SetSelected(bool selected) {
   selected_ = selected;
   SchedulePaint();
 }
 
 void MenuItemView::SetTooltip(const std::wstring& tooltip, int item_id) {
   MenuItemView* item = GetMenuItemByID(item_id);
   DCHECK(item);
@@ skipping 337 matching lines @@
 }
 
 string16 MenuItemView::GetAcceleratorText() {
   Accelerator accelerator;
   return (GetDelegate() &&
           GetDelegate()->GetAccelerator(GetCommand(), &accelerator)) ?
       accelerator.GetShortcutText() : string16();
 }
 
 }  // namespace views