Remove wstring from l10n_util. Part 7....

chrome/browser/ui/views/wrench_menu.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 "chrome/browser/views/wrench_menu.h"
 
 #include <cmath>
 
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
@@ skipping 228 matching lines @@
                                  urgent);
     }
   }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(ScheduleAllView);
 };
 
 std::wstring GetAccessibleNameForWrenchMenuItem(
       MenuModel* model, int item_index, int accessible_string_id) {
-  std::wstring accessible_name = l10n_util::GetString(accessible_string_id);
+  std::wstring accessible_name =
+      UTF16ToWide(l10n_util::GetStringUTF16(accessible_string_id));
   std::wstring accelerator_text;
 
   menus::Accelerator menu_accelerator;
   if (model->GetAcceleratorAt(item_index, &menu_accelerator)) {
     accelerator_text =
         views::Accelerator(menu_accelerator.GetKeyCode(),
                            menu_accelerator.modifiers()).GetShortcutText();
   }
 
   return MenuItemView::GetAccessibleNameForMenuItem(
@@ skipping 13 matching lines @@
     return CreateButtonWithAccName(
       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, l10n_util::GetString(string_id));
+        new TextButton(this, UTF16ToWide(l10n_util::GetStringUTF16(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);
@@ skipping 96 matching lines @@
         fullscreen_index_(fullscreen_index),
         increment_button_(NULL),
         zoom_label_(NULL),
         decrement_button_(NULL),
         fullscreen_button_(NULL),
         zoom_label_width_(0) {
     decrement_button_ = CreateButtonWithAccName(
         IDS_ZOOM_MINUS2, MenuButtonBackground::LEFT_BUTTON, decrement_index,
         NULL, IDS_ACCNAME_ZOOM_MINUS2);
 
-    zoom_label_ = new Label(l10n_util::GetStringF(IDS_ZOOM_PERCENT, L"100"));
+    zoom_label_ = new Label(
+        UTF16ToWide(l10n_util::GetStringFUTF16Int(IDS_ZOOM_PERCENT, 100)));
     zoom_label_->SetColor(MenuConfig::instance().text_color);
     zoom_label_->SetHorizontalAlignment(Label::ALIGN_RIGHT);
     MenuButtonBackground* center_bg =
         new MenuButtonBackground(MenuButtonBackground::CENTER_BUTTON);
     zoom_label_->set_background(center_bg);
     zoom_label_->set_border(new MenuButtonBorder());
     zoom_label_->SetFont(MenuConfig::instance().font);
     AddChildView(zoom_label_);
     zoom_label_width_ = MaxWidthForZoomLabel();
 
@@ skipping 84 matching lines @@
  private:
   void UpdateZoomControls() {
     bool enable_increment = false;
     bool enable_decrement = false;
     TabContents* selected_tab = menu_->browser_->GetSelectedTabContents();
     int zoom = 100;
     if (selected_tab)
       zoom = selected_tab->GetZoomPercent(&enable_increment, &enable_decrement);
     increment_button_->SetEnabled(enable_increment);
     decrement_button_->SetEnabled(enable_decrement);
-    zoom_label_->SetText(l10n_util::GetStringF(
-                             IDS_ZOOM_PERCENT,
-                             UTF8ToWide(base::IntToString(zoom))));
+    zoom_label_->SetText(UTF16ToWide(l10n_util::GetStringFUTF16Int(
+                                     IDS_ZOOM_PERCENT,
+                                     zoom)));
 
     zoom_label_width_ = MaxWidthForZoomLabel();
   }
 
   // Calculates the max width the zoom string can be.
   int MaxWidthForZoomLabel() {
     gfx::Font font = zoom_label_->font();
     gfx::Insets insets;
     if (zoom_label_->border())
       zoom_label_->border()->GetInsets(&insets);
@@ skipping 45 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(l10n_util::GetString(IDS_ACCNAME_APP));
+  root_->SetAccessibleName(
+      UTF16ToWide(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 72 matching lines @@
         AppendMenuItem(parent, model, index, model->GetTypeAt(index), next_id);
 
     if (model->GetTypeAt(index) == MenuModel::TYPE_SUBMENU)
       PopulateMenu(item, model->GetSubmenuModelAt(index), next_id);
 
     if (model->GetCommandIdAt(index) == IDC_CUT) {
       DCHECK_EQ(MenuModel::TYPE_COMMAND, model->GetTypeAt(index));
       DCHECK_LT(i + 2, max);
       DCHECK_EQ(IDC_COPY, model->GetCommandIdAt(index + 1));
       DCHECK_EQ(IDC_PASTE, model->GetCommandIdAt(index + 2));
-      item->SetTitle(l10n_util::GetString(IDS_EDIT2));
+      item->SetTitle(UTF16ToWide(l10n_util::GetStringUTF16(IDS_EDIT2)));
       item->AddChildView(
           new CutCopyPasteView(this, model, index, index + 1, index + 2));
       i += 2;
     } else if (model->GetCommandIdAt(index) == IDC_ZOOM_MINUS) {
       DCHECK_EQ(MenuModel::TYPE_COMMAND, model->GetTypeAt(index));
       DCHECK_EQ(IDC_ZOOM_PLUS, model->GetCommandIdAt(index + 1));
       DCHECK_EQ(IDC_FULLSCREEN, model->GetCommandIdAt(index + 2));
-      item->SetTitle(l10n_util::GetString(IDS_ZOOM_MENU2));
+      item->SetTitle(UTF16ToWide(l10n_util::GetStringUTF16(IDS_ZOOM_MENU2)));
       item->AddChildView(
           new ZoomView(this, model, index, index + 1, index + 2));
       i += 2;
     }
   }
 }
 
 MenuItemView* WrenchMenu::AppendMenuItem(MenuItemView* parent,
                                          MenuModel* model,
                                          int index,
@@ skipping 16 matching lines @@
   }
 
   return menu_item;
 }
 
 void WrenchMenu::CancelAndEvaluate(MenuModel* model, int index) {
   selected_menu_model_ = model;
   selected_index_ = index;
   root_->Cancel();
 }