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

chrome/browser/ui/views/global_error_bubble_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/global_error_bubble_view.h"
 
 #include "base/logging.h"
 #include "chrome/browser/ui/global_error.h"
 #include "chrome/browser/ui/views/frame/browser_view.h"
 #include "chrome/browser/ui/views/toolbar_view.h"
@@ skipping 13 matching lines @@
 };
 
 const int kBubbleViewWidth = 262;
 
 // The horizontal padding between the title and the icon.
 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)
     : browser_(browser),
       error_(error) {
   ResourceBundle& rb = ResourceBundle::GetSharedInstance();
   int resource_id = error_->GetBubbleViewIconResourceID();
   scoped_ptr<views::ImageView> image_view(new views::ImageView());
   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);
 
   string16 accept_string(error_->GetBubbleViewAcceptButtonLabel());
   scoped_ptr<views::TextButton> accept_button(
       new views::NativeTextButton(this, UTF16ToWideHack(accept_string)));
   accept_button->SetIsDefault(true);
 
   string16 cancel_string(error_->GetBubbleViewCancelButtonLabel());
   scoped_ptr<views::TextButton> cancel_button;
@@ skipping 88 matching lines @@
   gfx::Rect bounds(origin.x(), origin.y(), wrench_button->width(),
                    wrench_button->height());
   bounds.Inset(0, kWrenchBubblePointOffsetY);
 
   GlobalErrorBubbleView* bubble_view =
       new GlobalErrorBubbleView(browser, error);
   // Bubble::Show() takes ownership of the view.
   Bubble::Show(browser_view->GetWidget(), bounds,
                views::BubbleBorder::TOP_RIGHT, bubble_view, bubble_view);
 }