Revert 71167 - Remove wstring from gfx....

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 "app/l10n_util.h"
 #include "app/resource_bundle.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/google/google_util.h"
@@ skipping 58 matching lines @@
   SkPaint paint;
   SkSafeUnref(paint.setShader(gfx::CreateGradientShader(0, height(),
                                                         kBackgroundColor,
                                                         kBackgroundEndColor)));
   paint.setStyle(SkPaint::kFill_Style);
   canvas->AsCanvasSkia()->drawRectCoords(
       0, 0, SkIntToScalar(width()), SkIntToScalar(height()), paint);
 
   canvas->DrawBitmapInt(*sad_tab_bitmap_, icon_bounds_.x(), icon_bounds_.y());
 
-  canvas->DrawStringInt(WideToUTF16Hack(title_), *title_font_, kTitleColor,
-                        title_bounds_.x(), title_bounds_.y(),
-                        title_bounds_.width(), title_bounds_.height(),
+  canvas->DrawStringInt(title_, *title_font_, kTitleColor, title_bounds_.x(),
+                        title_bounds_.y(), title_bounds_.width(),
+                        title_bounds_.height(),
                         gfx::Canvas::TEXT_ALIGN_CENTER);
 
-  canvas->DrawStringInt(WideToUTF16Hack(message_), *message_font_,
-                        kMessageColor, message_bounds_.x(), message_bounds_.y(),
+  canvas->DrawStringInt(message_, *message_font_, kMessageColor,
+                        message_bounds_.x(), message_bounds_.y(),
                         message_bounds_.width(), message_bounds_.height(),
                         gfx::Canvas::MULTI_LINE);
 
   if (learn_more_link_ != NULL)
     learn_more_link_->SetBounds(link_bounds_.x(), link_bounds_.y(),
                                 link_bounds_.width(), link_bounds_.height());
 }
 
 void SadTabView::Layout() {
   int icon_width = sad_tab_bitmap_->width();
@@ skipping 54 matching lines @@
         rb.GetFont(ResourceBundle::BaseFont).DeriveFont(kMessageFontSizeDelta));
     sad_tab_bitmap_ = rb.GetBitmapNamed(IDR_SAD_TAB);
 
     title_ = UTF16ToWide(l10n_util::GetStringUTF16(IDS_SAD_TAB_TITLE));
     title_width_ = title_font_->GetStringWidth(WideToUTF16Hack(title_));
     message_ = UTF16ToWide(l10n_util::GetStringUTF16(IDS_SAD_TAB_MESSAGE));
 
     initialized = true;
   }
 }