Lands http://codereview.chromium.org/194014 for Oshima:...

views/controls/message_box_view.cc

 // Copyright (c) 2006-2008 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 "app/l10n_util.h"
 #include "app/message_box_flags.h"
 #include "base/clipboard.h"
 #include "base/message_loop.h"
@@ skipping 29 matching lines @@
       prompt_field_(NULL),
       icon_(NULL),
       checkbox_(NULL),
       message_width_(kDefaultMessageWidth),
       ALLOW_THIS_IN_INITIALIZER_LIST(focus_grabber_factory_(this)) {
   Init(dialog_flags, default_prompt);
 }
 
 std::wstring MessageBoxView::GetInputText() {
   if (prompt_field_)
-    return prompt_field_->text();
+    return UTF16ToWideHack(prompt_field_->text());
   return EmptyWString();
 }
 
 bool MessageBoxView::IsCheckBoxSelected() {
   return checkbox_ ? checkbox_->checked() : false;
 }
 
 void MessageBoxView::SetIcon(const SkBitmap& icon) {
   if (!icon_)
     icon_ = new views::ImageView();
@@ skipping 38 matching lines @@
     return false;
 
   if (!views::ViewsDelegate::views_delegate)
     return false;
 
   Clipboard* clipboard = views::ViewsDelegate::views_delegate->GetClipboard();
   if (!clipboard)
     return false;
 
   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);
@@ skipping 11 matching lines @@
     // AUTO_DETECT_ALIGNMENT so that the alignment will not be flipped around
     // in RTL locales.
     message_label_->SetRTLAlignmentMode(views::Label::AUTO_DETECT_ALIGNMENT);
     message_label_->SetHorizontalAlignment(alignment);
   } else {
     message_label_->SetHorizontalAlignment(views::Label::ALIGN_LEFT);
   }
 
   if (dialog_flags & MessageBoxFlags::kFlagHasPromptField) {
     prompt_field_ = new views::Textfield;
-    prompt_field_->SetText(default_prompt);
+    prompt_field_->SetText(WideToUTF16Hack(default_prompt));
   }
 
   ResetLayoutManager();
 }
 
 void MessageBoxView::ResetLayoutManager() {
   using views::GridLayout;
   using views::ColumnSet;
 
   // Initialize the Grid Layout Manager used for this dialog box.
@@ skipping 54 matching lines @@
   }
 
   if (checkbox_) {
     layout->AddPaddingRow(0, kRelatedControlVerticalSpacing);
     layout->StartRow(0, checkbox_column_view_set_id);
     layout->AddView(checkbox_);
   }
 
   layout->AddPaddingRow(0, kRelatedControlVerticalSpacing);
 }