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

chrome/browser/ui/views/sad_tab_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/sad_tab_view.h"
 
 #include "base/metrics/histogram.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/google/google_util.h"
 #include "chrome/browser/ui/browser.h"
@@ skipping 83 matching lines @@
                      0, views::GridLayout::USE_PREF, 0, 0);
   columns->AddPaddingColumn(1, kPadding);
 
   views::ImageView* image = new views::ImageView();
   ResourceBundle& rb = ResourceBundle::GetSharedInstance();
   image->SetImage(
       rb.GetBitmapNamed((kind_ == CRASHED) ? IDR_SAD_TAB : IDR_KILLED_TAB));
   layout->StartRowWithPadding(0, column_set_id, 1, kPadding);
   layout->AddView(image);
 
-  views::Label* title = new views::Label(l10n_util::GetStringUTF16(
-      (kind_ == CRASHED) ? IDS_SAD_TAB_TITLE : IDS_KILLED_TAB_TITLE));
+  views::Label* title = new views::Label(UTF16ToWide(l10n_util::GetStringUTF16(
+      (kind_ == CRASHED) ? IDS_SAD_TAB_TITLE : IDS_KILLED_TAB_TITLE)));
   const gfx::Font& base_font = rb.GetFont(ResourceBundle::BaseFont);
   title->SetFont(base_font.DeriveFont(kTitleFontSizeDelta, gfx::Font::BOLD));
   title->SetColor(kTextColor);
   layout->StartRowWithPadding(0, column_set_id, 0, kPadding);
   layout->AddView(title);
 
-  message_ = new views::Label(l10n_util::GetStringUTF16(
-      (kind_ == CRASHED) ? IDS_SAD_TAB_MESSAGE : IDS_KILLED_TAB_MESSAGE));
+  message_ = new views::Label(UTF16ToWide(l10n_util::GetStringUTF16(
+      (kind_ == CRASHED) ? IDS_SAD_TAB_MESSAGE : IDS_KILLED_TAB_MESSAGE)));
   message_->SetFont(base_font.DeriveFont(kMessageFontSizeDelta));
   message_->SetColor(kTextColor);
   message_->SetMultiLine(true);
   layout->StartRowWithPadding(0, column_set_id, 0, kPadding);
   layout->AddView(message_);
 
   if (tab_contents_) {
-    string16 help_link(l10n_util::GetStringUTF16(
-        (kind_ == CRASHED) ? IDS_SAD_TAB_HELP_LINK : IDS_LEARN_MORE));
+    std::wstring help_link(UTF16ToWide(l10n_util::GetStringUTF16(
+        (kind_ == CRASHED) ? IDS_SAD_TAB_HELP_LINK : IDS_LEARN_MORE)));
     help_link_ = new views::Link(help_link);
     help_link_->SetFont(base_font.DeriveFont(kMessageFontSizeDelta));
     help_link_->SetNormalColor(kTextColor);
     help_link_->set_listener(this);
 
     if (kind_ == CRASHED) {
       size_t offset = 0;
       string16 help_text(l10n_util::GetStringFUTF16(IDS_SAD_TAB_HELP_MESSAGE,
                                                     string16(), &offset));
       views::Label* help_prefix =
-          new views::Label(help_text.substr(0, offset));
+          new views::Label(UTF16ToWide(help_text.substr(0, offset)));
       help_prefix->SetFont(base_font.DeriveFont(kMessageFontSizeDelta));
       help_prefix->SetColor(kTextColor);
-      views::Label* help_suffix = new views::Label(help_text.substr(offset));
+      views::Label* help_suffix =
+          new views::Label(UTF16ToWide(help_text.substr(offset)));
       help_suffix->SetFont(base_font.DeriveFont(kMessageFontSizeDelta));
       help_suffix->SetColor(kTextColor);
 
       const int help_column_set_id = 1;
       views::ColumnSet* help_columns = layout->AddColumnSet(help_column_set_id);
       help_columns->AddPaddingColumn(1, kPadding);
       // Center three middle columns for the help's [prefix][link][suffix].
       for (size_t column = 0; column < 3; column++)
         help_columns->AddColumn(views::GridLayout::CENTER,
             views::GridLayout::CENTER, 0, views::GridLayout::USE_PREF, 0, 0);
       help_columns->AddPaddingColumn(1, kPadding);
 
       layout->StartRowWithPadding(0, help_column_set_id, 0, kPadding);
       layout->AddView(help_prefix);
       layout->AddView(help_link_);
       layout->AddView(help_suffix);
     } else {
       layout->StartRowWithPadding(0, column_set_id, 0, kPadding);
       layout->AddView(help_link_);
 
-      feedback_link_ = new views::Link(
-          l10n_util::GetStringUTF16(IDS_KILLED_TAB_FEEDBACK_LINK));
+      feedback_link_ = new views::Link(UTF16ToWide(
+          l10n_util::GetStringUTF16(IDS_KILLED_TAB_FEEDBACK_LINK)));
       feedback_link_->SetFont(base_font.DeriveFont(kMessageFontSizeDelta));
       feedback_link_->SetNormalColor(kTextColor);
       feedback_link_->set_listener(this);
       layout->StartRowWithPadding(0, column_set_id, 0, kPadding);
       layout->AddView(feedback_link_);
     }
   }
   layout->AddPaddingRow(1, kPadding);
 }
 
 void SadTabView::OnPaint(gfx::Canvas* canvas) {
   if (!painted_) {
     // User actually saw the error, keep track for user experience stats.
     UMA_HISTOGRAM_COUNTS("SadTab.Displayed", kind_);
     painted_ = true;
   }
   View::OnPaint(canvas);
 }