Remove wstring from l10n_util. Part 7....

chrome/browser/ui/views/hung_renderer_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 "chrome/browser/hung_renderer_dialog.h"
 
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
 #include "base/i18n/rtl.h"
 #include "base/utf_string_conversions.h"
@@ skipping 249 matching lines @@
     window()->Close();
     // Since we're closing, we no longer need this TabContents.
     contents_ = NULL;
   }
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 // HungRendererDialogView, views::DialogDelegate implementation:
 
 std::wstring HungRendererDialogView::GetWindowTitle() const {
-  return l10n_util::GetString(IDS_BROWSER_HANGMONITOR_RENDERER_TITLE);
+  return UTF16ToWide(
+      l10n_util::GetStringUTF16(IDS_BROWSER_HANGMONITOR_RENDERER_TITLE));
 }
 
 void HungRendererDialogView::WindowClosing() {
   // We are going to be deleted soon, so make sure our instance is destroyed.
   g_instance = NULL;
 }
 
 int HungRendererDialogView::GetDialogButtons() const {
   // We specifically don't want a CANCEL button here because that code path is
   // also called when the window is closed by the user clicking the X button in
   // the window's titlebar, and also if we call Window::Close. Rather, we want
   // the OK button to wait for responsiveness (and close the dialog) and our
   // additional button (which we create) to kill the process (which will result
   // in the dialog being destroyed).
   return MessageBoxFlags::DIALOGBUTTON_OK;
 }
 
 std::wstring HungRendererDialogView::GetDialogButtonLabel(
     MessageBoxFlags::DialogButton button) const {
   if (button == MessageBoxFlags::DIALOGBUTTON_OK)
-    return l10n_util::GetString(IDS_BROWSER_HANGMONITOR_RENDERER_WAIT);
+    return UTF16ToWide(
+        l10n_util::GetStringUTF16(IDS_BROWSER_HANGMONITOR_RENDERER_WAIT));
   return std::wstring();
 }
 
 views::View* HungRendererDialogView::GetExtraView() {
   return kill_button_container_;
 }
 
 bool HungRendererDialogView::Accept(bool window_closing) {
   // Don't do anything if we're being called only because the dialog is being
   // destroyed and we don't supply a Cancel function...
@@ skipping 35 matching lines @@
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 // HungRendererDialogView, private:
 
 void HungRendererDialogView::Init() {
   frozen_icon_view_ = new views::ImageView;
   frozen_icon_view_->SetImage(frozen_icon_);
 
   info_label_ = new views::Label(
-      l10n_util::GetString(IDS_BROWSER_HANGMONITOR_RENDERER));
+      UTF16ToWide(l10n_util::GetStringUTF16(IDS_BROWSER_HANGMONITOR_RENDERER)));
   info_label_->SetMultiLine(true);
   info_label_->SetHorizontalAlignment(views::Label::ALIGN_LEFT);
 
   hung_pages_table_model_.reset(new HungPagesTableModel);
   std::vector<TableColumn> columns;
   columns.push_back(TableColumn());
   hung_pages_table_ = new views::GroupTableView(
       hung_pages_table_model_.get(), columns, views::ICON_AND_TEXT, true,
       false, true, false);
   hung_pages_table_->SetPreferredSize(
@@ skipping 22 matching lines @@
   layout->AddPaddingRow(0, kUnrelatedControlVerticalSpacing);
 
   layout->StartRow(0, double_column_set_id);
   layout->SkipColumns(1);
   layout->AddView(hung_pages_table_);
 
   initialized_ = true;
 }
 
 void HungRendererDialogView::CreateKillButtonView() {
-  kill_button_ = new views::NativeButton(
-      this, l10n_util::GetString(IDS_BROWSER_HANGMONITOR_RENDERER_END));
+  kill_button_ = new views::NativeButton(this, UTF16ToWide(
+      l10n_util::GetStringUTF16(IDS_BROWSER_HANGMONITOR_RENDERER_END)));
 
   kill_button_container_ = new ButtonContainer;
 
   using views::GridLayout;
   using views::ColumnSet;
 
   GridLayout* layout = new GridLayout(kill_button_container_);
   kill_button_container_->SetLayoutManager(layout);
 
   const int single_column_set_id = 0;
@@ skipping 53 matching lines @@
 }
 
 // static
 void HideForTabContents(TabContents* contents) {
   if (!logging::DialogsAreSuppressed() && g_instance)
     g_instance->EndForTabContents(contents);
 }
 
 }  // namespace hung_renderer_dialog