Revert 104076 - Change std::wstring to string16 for views::Link

chrome/browser/ui/views/download/download_in_progress_dialog_view.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/download/download_in_progress_dialog_view.h"
 
 #include <algorithm>
 
 #include "base/string_number_conversions.h"
 #include "base/utf_string_conversions.h"
@@ skipping 10 matching lines @@
 #include "views/controls/label.h"
 #include "views/layout/grid_layout.h"
 #include "views/widget/widget.h"
 
 DownloadInProgressDialogView::DownloadInProgressDialogView(Browser* browser)
     : browser_(browser),
       product_name_(l10n_util::GetStringUTF16(IDS_PRODUCT_NAME)) {
   int download_count = browser->profile()->GetDownloadManager()->
       in_progress_count();
 
-  string16 warning_text;
-  string16 explanation_text;
+  std::wstring warning_text;
+  std::wstring explanation_text;
   if (download_count == 1) {
-    warning_text = l10n_util::GetStringFUTF16(
+    warning_text = UTF16ToWide(l10n_util::GetStringFUTF16(
         IDS_SINGLE_DOWNLOAD_REMOVE_CONFIRM_WARNING,
-        product_name_);
-    explanation_text = l10n_util::GetStringFUTF16(
+        product_name_));
+    explanation_text = UTF16ToWide(l10n_util::GetStringFUTF16(
         IDS_SINGLE_DOWNLOAD_REMOVE_CONFIRM_EXPLANATION,
-        product_name_);
-    ok_button_text_ = l10n_util::GetStringUTF16(
-        IDS_SINGLE_DOWNLOAD_REMOVE_CONFIRM_OK_BUTTON_LABEL);
-    cancel_button_text_ = l10n_util::GetStringUTF16(
-        IDS_SINGLE_DOWNLOAD_REMOVE_CONFIRM_CANCEL_BUTTON_LABEL);
+        product_name_));
+    ok_button_text_ = UTF16ToWide(l10n_util::GetStringUTF16(
+        IDS_SINGLE_DOWNLOAD_REMOVE_CONFIRM_OK_BUTTON_LABEL));
+    cancel_button_text_ = UTF16ToWide(l10n_util::GetStringUTF16(
+        IDS_SINGLE_DOWNLOAD_REMOVE_CONFIRM_CANCEL_BUTTON_LABEL));
   } else {
-    warning_text = l10n_util::GetStringFUTF16(
+    warning_text = UTF16ToWide(l10n_util::GetStringFUTF16(
         IDS_MULTIPLE_DOWNLOADS_REMOVE_CONFIRM_WARNING,
         product_name_,
-        UTF8ToUTF16(base::IntToString(download_count)));
-    explanation_text = l10n_util::GetStringFUTF16(
+        UTF8ToUTF16(base::IntToString(download_count))));
+    explanation_text = UTF16ToWide(l10n_util::GetStringFUTF16(
         IDS_MULTIPLE_DOWNLOADS_REMOVE_CONFIRM_EXPLANATION,
-        product_name_);
-    ok_button_text_ = l10n_util::GetStringUTF16(
-        IDS_MULTIPLE_DOWNLOADS_REMOVE_CONFIRM_OK_BUTTON_LABEL);
-    cancel_button_text_ = l10n_util::GetStringUTF16(
-        IDS_MULTIPLE_DOWNLOADS_REMOVE_CONFIRM_CANCEL_BUTTON_LABEL);
+        product_name_));
+    ok_button_text_ = UTF16ToWide(l10n_util::GetStringUTF16(
+        IDS_MULTIPLE_DOWNLOADS_REMOVE_CONFIRM_OK_BUTTON_LABEL));
+    cancel_button_text_ = UTF16ToWide(l10n_util::GetStringUTF16(
+        IDS_MULTIPLE_DOWNLOADS_REMOVE_CONFIRM_CANCEL_BUTTON_LABEL));
   }
 
   // There are two lines of text: the bold warning label and the text
   // explanation label.
   views::GridLayout* layout = new views::GridLayout(this);
   SetLayoutManager(layout);
   const int columnset_id = 0;
   views::ColumnSet* column_set = layout->AddColumnSet(columnset_id);
   column_set->AddColumn(views::GridLayout::FILL, views::GridLayout::LEADING, 1,
                         views::GridLayout::USE_PREF, 0, 0);
@@ skipping 27 matching lines @@
 
 DownloadInProgressDialogView::~DownloadInProgressDialogView() {}
 
 gfx::Size DownloadInProgressDialogView::GetPreferredSize() {
   return dialog_dimensions_;
 }
 
 std::wstring DownloadInProgressDialogView::GetDialogButtonLabel(
     MessageBoxFlags::DialogButton button) const {
   if (button == MessageBoxFlags::DIALOGBUTTON_OK)
-    return UTF16ToWideHack(ok_button_text_);
+    return ok_button_text_;
 
   DCHECK_EQ(MessageBoxFlags::DIALOGBUTTON_CANCEL, button);
-  return UTF16ToWideHack(cancel_button_text_);
+  return cancel_button_text_;
 }
 
 int DownloadInProgressDialogView::GetDefaultDialogButton() const {
   return MessageBoxFlags::DIALOGBUTTON_CANCEL;
 }
 
 bool DownloadInProgressDialogView::Cancel() {
   browser_->InProgressDownloadResponse(false);
   return true;
 }
 
 bool DownloadInProgressDialogView::Accept() {
   browser_->InProgressDownloadResponse(true);
   return true;
 }
 
 bool DownloadInProgressDialogView::IsModal() const {
   return true;
 }
 
 string16 DownloadInProgressDialogView::GetWindowTitle() const {
   return product_name_;
 }
 
 views::View* DownloadInProgressDialogView::GetContentsView() {
   return this;
 }