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

chrome/browser/chromeos/login/message_bubble.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/chromeos/login/message_bubble.h"
 
 #include <vector>
 
 #include "base/logging.h"
-#include "base/utf_string_conversions.h"
 #include "chrome/browser/chromeos/login/helper.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources_standard.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "views/controls/button/image_button.h"
 #include "views/controls/image_view.h"
 #include "views/controls/label.h"
 #include "views/controls/link.h"
 #include "views/layout/grid_layout.h"
 #include "views/widget/widget.h"
@@ skipping 35 matching lines @@
                           GridLayout::USE_PREF, 0, 0);
   }
 
   ResourceBundle& rb = ResourceBundle::GetSharedInstance();
 
   layout->StartRow(0, 0);
   icon_ = new views::ImageView();
   icon_->SetImage(*image);
   layout->AddView(icon_);
 
-  text_ = new views::Label(WideToUTF16Hack(text));
+  text_ = new views::Label(text);
   text_->SetMultiLine(true);
   text_->SetHorizontalAlignment(views::Label::ALIGN_LEFT);
   text_->SizeToFit(kMaxLabelWidth);
   layout->AddView(text_);
 
   close_button_ = new views::ImageButton(this);
   close_button_->SetImage(views::CustomButton::BS_NORMAL,
       rb.GetBitmapNamed(IDR_CLOSE_BAR));
   close_button_->SetImage(views::CustomButton::BS_HOT,
       rb.GetBitmapNamed(IDR_CLOSE_BAR_H));
   close_button_->SetImage(views::CustomButton::BS_PUSHED,
       rb.GetBitmapNamed(IDR_CLOSE_BAR_P));
   layout->AddView(close_button_);
 
   for (size_t i = 0; i < links.size(); ++i) {
     layout->StartRowWithPadding(0, 1, 0, kBorderSize);
-    views::Link* help_link_ = new views::Link(WideToUTF16Hack(links[i]));
+    views::Link* help_link_ = new views::Link(links[i]);
     help_links_.push_back(help_link_);
     help_link_->set_listener(this);
     help_link_->SetNormalColor(login::kLinkColor);
     help_link_->SetHighlightedColor(login::kLinkColor);
     layout->AddView(help_link_);
   }
 }
 
 MessageBubble::~MessageBubble() {
 }
@@ skipping 102 matching lines @@
 #if !defined(TOUCH_UI) && !defined(USE_AURA)
 gboolean MessageBubble::OnButtonPress(GtkWidget* widget,
                                       GdkEventButton* event) {
   NativeWidgetGtk::OnButtonPress(widget, event);
   // Never propagate event to parent.
   return true;
 }
 #endif
 
 }  // namespace chromeos