Change std::wstring to string16 for views::Label and views::Link

chrome/browser/ui/views/global_error_bubble_view.cc

Index: chrome/browser/ui/views/global_error_bubble_view.cc
diff --git a/chrome/browser/ui/views/global_error_bubble_view.cc b/chrome/browser/ui/views/global_error_bubble_view.cc
index ff9be84b23cc6c9dd5618a9116c0711ce8b75fdc..234181fbbec9f2acfb93861ad28e62143d103013 100644
--- a/chrome/browser/ui/views/global_error_bubble_view.cc
+++ b/chrome/browser/ui/views/global_error_bubble_view.cc
@@ -31,7 +31,7 @@ const int kTitleHorizontalPadding = 3;
 // The vertical offset of the wrench bubble from the wrench menu button.
 const int kWrenchBubblePointOffsetY = 6;
 
-} // namespace
+}  // namespace
 
 GlobalErrorBubbleView::GlobalErrorBubbleView(Browser* browser,
                                              GlobalError* error)
@@ -43,15 +43,13 @@ GlobalErrorBubbleView::GlobalErrorBubbleView(Browser* browser,
   image_view->SetImage(rb.GetImageNamed(resource_id).ToSkBitmap());
 
   string16 title_string(error_->GetBubbleViewTitle());
-  scoped_ptr<views::Label> title_label(
-      new views::Label(UTF16ToWideHack(title_string)));
+  scoped_ptr<views::Label> title_label(new views::Label(title_string));
   title_label->SetMultiLine(true);
   title_label->SetHorizontalAlignment(views::Label::ALIGN_LEFT);
   title_label->SetFont(title_label->font().DeriveFont(1));
 
   string16 message_string(error_->GetBubbleViewMessage());
-  scoped_ptr<views::Label> message_label(
-      new views::Label(UTF16ToWideHack(message_string)));
+  scoped_ptr<views::Label> message_label(new views::Label(message_string));
   message_label->SetMultiLine(true);
   message_label->SetHorizontalAlignment(views::Label::ALIGN_LEFT);