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

* enable MessageBoxView
convert wstring to string16 when necessary using WideToUTF16Hack, which is no-op on Windows.
* updated checkbox to get state update working
state handing is a bit hacky, esp. b/c gtk sends signal even when the state is changed via API.
If there is better way, please let me know.

BUG=none
TEST=none

Review URL: http://codereview.chromium.org/201079

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@25896 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 3 insertions, 3 deletions

diff --git a/views/controls/message_box_view.cc b/views/controls/message_box_view.cc
index 8d68e4f..a90d440 100644
--- a/views/controls/message_box_view.cc
+++ b/views/controls/message_box_view.cc
@@ -47,7 +47,7 @@ MessageBoxView::MessageBoxView(int dialog_flags,
 
 std::wstring MessageBoxView::GetInputText() {
   if (prompt_field_)
-    return prompt_field_->text();
+    return UTF16ToWideHack(prompt_field_->text());
   return EmptyWString();
 }
 
@@ -106,7 +106,7 @@ bool MessageBoxView::AcceleratorPressed(
     return false;
 
   ScopedClipboardWriter scw(clipboard);
-  scw.WriteText(message_label_->GetText());
+  scw.WriteText(WideToUTF16Hack(message_label_->GetText()));
   return true;
 }
 
@@ -138,7 +138,7 @@ void MessageBoxView::Init(int dialog_flags,
 
   if (dialog_flags & MessageBoxFlags::kFlagHasPromptField) {
     prompt_field_ = new views::Textfield;
-    prompt_field_->SetText(default_prompt);
+    prompt_field_->SetText(WideToUTF16Hack(default_prompt));
   }
 
   ResetLayoutManager();