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

views/controls/message_box_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 "views/controls/message_box_view.h"
 
 #include "base/i18n/rtl.h"
 #include "base/message_loop.h"
 #include "base/utf_string_conversions.h"
 #include "ui/base/accessibility/accessible_view_state.h"
@@ skipping 14 matching lines @@
 
 namespace views {
 
 ///////////////////////////////////////////////////////////////////////////////
 // MessageBoxView, public:
 
 MessageBoxView::MessageBoxView(int dialog_flags,
                                const std::wstring& message,
                                const std::wstring& default_prompt,
                                int message_width)
-    : message_label_(new Label(WideToUTF16Hack(message))),
+    : message_label_(new Label(message)),
       prompt_field_(NULL),
       icon_(NULL),
       checkbox_(NULL),
       message_width_(message_width) {
   Init(dialog_flags, default_prompt);
 }
 
 MessageBoxView::MessageBoxView(int dialog_flags,
                                const std::wstring& message,
                                const std::wstring& default_prompt)
-    : message_label_(new Label(WideToUTF16Hack(message))),
+    : message_label_(new Label(message)),
       prompt_field_(NULL),
       icon_(NULL),
       checkbox_(NULL),
       message_width_(kDefaultMessageWidth) {
   Init(dialog_flags, default_prompt);
 }
 
 MessageBoxView::~MessageBoxView() {}
 
 string16 MessageBoxView::GetInputText() {
@@ skipping 55 matching lines @@
     return false;
 
   if (!ViewsDelegate::views_delegate)
     return false;
 
   ui::Clipboard* clipboard = ViewsDelegate::views_delegate->GetClipboard();
   if (!clipboard)
     return false;
 
   ui::ScopedClipboardWriter scw(clipboard);
-  scw.WriteText(message_label_->GetText());
+  scw.WriteText(WideToUTF16Hack(message_label_->GetText()));
   return true;
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 // MessageBoxView, private:
 
 void MessageBoxView::Init(int dialog_flags,
                           const std::wstring& default_prompt) {
   message_label_->SetMultiLine(true);
   message_label_->SetAllowCharacterBreak(true);
   if (dialog_flags & ui::MessageBoxFlags::kAutoDetectAlignment) {
     // Determine the alignment and directionality based on the first character
     // with strong directionality.
     base::i18n::TextDirection direction =
         base::i18n::GetFirstStrongCharacterDirection(
-            message_label_->GetText());
+            WideToUTF16(message_label_->GetText()));
     Label::Alignment alignment;
     if (direction == base::i18n::RIGHT_TO_LEFT)
       alignment = Label::ALIGN_RIGHT;
     else
       alignment = Label::ALIGN_LEFT;
     // In addition, we should set the RTL alignment mode as
     // AUTO_DETECT_ALIGNMENT so that the alignment will not be flipped around
     // in RTL locales.
     message_label_->set_rtl_alignment_mode(Label::AUTO_DETECT_ALIGNMENT);
     message_label_->SetHorizontalAlignment(alignment);
@@ skipping 70 matching lines @@
   if (checkbox_) {
     layout->AddPaddingRow(0, kRelatedControlVerticalSpacing);
     layout->StartRow(0, checkbox_column_view_set_id);
     layout->AddView(checkbox_);
   }
 
   layout->AddPaddingRow(0, kRelatedControlVerticalSpacing);
 }
 
 }  // namespace views