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

chrome/browser/ui/views/wrench_menu.cc

 // Copyright (c) 2011 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/ui/views/wrench_menu.h"
 
 #include <cmath>
 
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
@@ skipping 264 matching lines @@
       string_id, type, index, background, string_id);
   }
 
   TextButton* CreateButtonWithAccName(int string_id,
                                       MenuButtonBackground::ButtonType type,
                                       int index,
                                       MenuButtonBackground** background,
                                       int acc_string_id) {
     TextButton* button =
         new TextButton(this, UTF16ToWide(l10n_util::GetStringUTF16(string_id)));
-    button->SetAccessibleName(UTF16ToWide(
-        GetAccessibleNameForWrenchMenuItem(menu_model_, index, acc_string_id)));
+    button->SetAccessibleName(
+        GetAccessibleNameForWrenchMenuItem(menu_model_, index, acc_string_id));
     button->SetFocusable(true);
     button->set_request_focus_on_press(false);
     button->set_tag(index);
     button->SetEnabled(menu_model_->IsEnabledAt(index));
     button->set_prefix_type(TextButton::PREFIX_HIDE);
     MenuButtonBackground* bg = new MenuButtonBackground(type);
     button->set_background(bg);
     button->SetEnabledColor(MenuConfig::instance().text_color);
     if (background)
       *background = bg;
@@ skipping 126 matching lines @@
             IDR_FULLSCREEN_MENU_BUTTON));
     fullscreen_button_->SetFocusable(true);
     fullscreen_button_->set_request_focus_on_press(false);
     fullscreen_button_->set_tag(fullscreen_index);
     fullscreen_button_->SetImageAlignment(
         ImageButton::ALIGN_CENTER, ImageButton::ALIGN_MIDDLE);
     fullscreen_button_->set_border(views::Border::CreateEmptyBorder(
         0, kHorizontalPadding, 0, kHorizontalPadding));
     fullscreen_button_->set_background(
         new MenuButtonBackground(MenuButtonBackground::SINGLE_BUTTON));
-    fullscreen_button_->SetAccessibleName(UTF16ToWide(
+    fullscreen_button_->SetAccessibleName(
         GetAccessibleNameForWrenchMenuItem(
-            menu_model, fullscreen_index, IDS_ACCNAME_FULLSCREEN)));
+            menu_model, fullscreen_index, IDS_ACCNAME_FULLSCREEN));
     AddChildView(fullscreen_button_);
 
     UpdateZoomControls();
 
     registrar_.Add(this, NotificationType::ZOOM_LEVEL_CHANGED,
                    Source<Profile>(menu->browser_->profile()));
   }
 
   gfx::Size GetPreferredSize() {
     // The increment/decrement button are forced to the same width.
@@ skipping 119 matching lines @@
 
 WrenchMenu::WrenchMenu(Browser* browser)
     : browser_(browser),
       selected_menu_model_(NULL),
       selected_index_(0) {
 }
 
 void WrenchMenu::Init(menus::MenuModel* model) {
   DCHECK(!root_.get());
   root_.reset(new MenuItemView(this));
-  root_->SetAccessibleName(
-      UTF16ToWide(l10n_util::GetStringUTF16(IDS_ACCNAME_APP)));
+  root_->SetAccessibleName(l10n_util::GetStringUTF16(IDS_ACCNAME_APP));
   root_->set_has_icons(true);  // We have checks, radios and icons, set this
                                // so we get the taller menu style.
   int next_id = 1;
   PopulateMenu(root_.get(), model, &next_id);
 }
 
 void WrenchMenu::RunMenu(views::MenuButton* host) {
   // Up the ref count while the menu is displaying. This way if the window is
   // deleted while we're running we won't prematurely delete the menu.
   // TODO(sky): fix this, the menu should really take ownership of the menu
@@ skipping 118 matching lines @@
   }
 
   return menu_item;
 }
 
 void WrenchMenu::CancelAndEvaluate(MenuModel* model, int index) {
   selected_menu_model_ = model;
   selected_index_ = index;
   root_->Cancel();
 }